Merge "Revert "Fix makefile include hierarchy""
diff --git a/media/codec2/Android.mk b/media/codec2/Android.mk
index 17f28ff..82d739f 100644
--- a/media/codec2/Android.mk
+++ b/media/codec2/Android.mk
@@ -45,4 +45,4 @@
 .PHONY: docs-all
 docs-all: docs-api docs-internal
 
-include $(call first-makefiles-under,$(call my-dir))
+include $(call all-makefiles-under,$(call my-dir))