diff --git a/Android.mk b/Android.mk
index 130267f..cca2852 100644
--- a/Android.mk
+++ b/Android.mk
@@ -17,8 +17,7 @@
 LOCAL_PATH := $(call my-dir)
 
 ifneq ($(filter instantnoodle instantnoodlep kebab,$(TARGET_DEVICE)),)
-subdir_makefiles=$(call first-makefiles-under,$(LOCAL_PATH))
-$(foreach mk,$(subdir_makefiles),$(info including $(mk) ...)$(eval include $(mk)))
+include $(call all-makefiles-under,$(LOCAL_PATH))
 
 include $(CLEAR_VARS)