diff --git a/benchmarks/msgq/1.0/Android.mk b/benchmarks/msgq/1.0/Android.mk
index b08d33f..e4a2b62 100644
--- a/benchmarks/msgq/1.0/Android.mk
+++ b/benchmarks/msgq/1.0/Android.mk
@@ -34,3 +34,6 @@
 
 LOCAL_MULTILIB := both
 include $(BUILD_SHARED_LIBRARY)
+
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/nfc/1.0/Android.mk b/nfc/1.0/Android.mk
index 9b1d49c..79a57cc 100644
--- a/nfc/1.0/Android.mk
+++ b/nfc/1.0/Android.mk
@@ -176,3 +176,6 @@
 	$(transform-generated-source)
 LOCAL_GENERATED_SOURCES += $(GEN)
 include $(BUILD_JAVA_LIBRARY)
+
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/tests/bar/1.0/Android.mk b/tests/bar/1.0/Android.mk
index 71eb751..fbf3a35 100644
--- a/tests/bar/1.0/Android.mk
+++ b/tests/bar/1.0/Android.mk
@@ -35,3 +35,6 @@
 
 LOCAL_MULTILIB := both
 include $(BUILD_SHARED_LIBRARY)
+
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/tests/baz/1.0/Android.mk b/tests/baz/1.0/Android.mk
index a0b36b0..6ccb89b 100644
--- a/tests/baz/1.0/Android.mk
+++ b/tests/baz/1.0/Android.mk
@@ -155,3 +155,6 @@
 	$(transform-generated-source)
 LOCAL_GENERATED_SOURCES += $(GEN)
 include $(BUILD_JAVA_LIBRARY)
+
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/tests/expression/1.0/Android.mk b/tests/expression/1.0/Android.mk
index e35a104..08713a7 100644
--- a/tests/expression/1.0/Android.mk
+++ b/tests/expression/1.0/Android.mk
@@ -62,3 +62,6 @@
 	$(transform-generated-source)
 LOCAL_GENERATED_SOURCES += $(GEN)
 include $(BUILD_JAVA_LIBRARY)
+
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/tests/foo/1.0/Android.mk b/tests/foo/1.0/Android.mk
index 10a1266..14eb76b 100644
--- a/tests/foo/1.0/Android.mk
+++ b/tests/foo/1.0/Android.mk
@@ -72,3 +72,6 @@
 
 LOCAL_MULTILIB := both
 include $(BUILD_SHARED_LIBRARY)
+
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/tests/libhwbinder/1.0/Android.mk b/tests/libhwbinder/1.0/Android.mk
index b4d5a71..358c3db 100644
--- a/tests/libhwbinder/1.0/Android.mk
+++ b/tests/libhwbinder/1.0/Android.mk
@@ -62,3 +62,6 @@
 	$(transform-generated-source)
 LOCAL_GENERATED_SOURCES += $(GEN)
 include $(BUILD_JAVA_LIBRARY)
+
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/tests/msgq/1.0/Android.mk b/tests/msgq/1.0/Android.mk
index 5ec5492..3f97e6c 100644
--- a/tests/msgq/1.0/Android.mk
+++ b/tests/msgq/1.0/Android.mk
@@ -34,3 +34,6 @@
 
 LOCAL_MULTILIB := both
 include $(BUILD_SHARED_LIBRARY)
+
+
+include $(call all-makefiles-under,$(LOCAL_PATH))