diff --git a/benchmarks/msgq/1.0/Android.mk b/benchmarks/msgq/1.0/Android.mk
index b08d33f7ff..e4a2b62043 100644
--- a/benchmarks/msgq/1.0/Android.mk
+++ b/benchmarks/msgq/1.0/Android.mk
@@ -34,3 +34,6 @@ LOCAL_SHARED_LIBRARIES := \
 
 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 9b1d49c1b3..79a57cc822 100644
--- a/nfc/1.0/Android.mk
+++ b/nfc/1.0/Android.mk
@@ -176,3 +176,6 @@ $(GEN): $(LOCAL_PATH)/INfcClientCallback.hal
 	$(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 71eb751c77..fbf3a35cc4 100644
--- a/tests/bar/1.0/Android.mk
+++ b/tests/bar/1.0/Android.mk
@@ -35,3 +35,6 @@ LOCAL_SHARED_LIBRARIES := \
 
 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 a0b36b0179..6ccb89b91b 100644
--- a/tests/baz/1.0/Android.mk
+++ b/tests/baz/1.0/Android.mk
@@ -155,3 +155,6 @@ $(GEN): $(LOCAL_PATH)/IBazCallback.hal
 	$(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 e35a10496e..08713a7946 100644
--- a/tests/expression/1.0/Android.mk
+++ b/tests/expression/1.0/Android.mk
@@ -62,3 +62,6 @@ $(GEN): $(LOCAL_PATH)/IExpression.hal
 	$(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 10a1266d5f..14eb76bd51 100644
--- a/tests/foo/1.0/Android.mk
+++ b/tests/foo/1.0/Android.mk
@@ -72,3 +72,6 @@ LOCAL_SHARED_LIBRARIES := \
 
 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 b4d5a7141c..358c3db7c2 100644
--- a/tests/libhwbinder/1.0/Android.mk
+++ b/tests/libhwbinder/1.0/Android.mk
@@ -62,3 +62,6 @@ $(GEN): $(LOCAL_PATH)/IBenchmark.hal
 	$(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 5ec5492a26..3f97e6c367 100644
--- a/tests/msgq/1.0/Android.mk
+++ b/tests/msgq/1.0/Android.mk
@@ -34,3 +34,6 @@ LOCAL_SHARED_LIBRARIES := \
 
 LOCAL_MULTILIB := both
 include $(BUILD_SHARED_LIBRARY)
+
+
+include $(call all-makefiles-under,$(LOCAL_PATH))