Merge "Fix makefile include hierarchy" am: 4b34c69843 am: 42d908a943 am: 08ada20294

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1324051

Change-Id: I13126f17ead95b8057ab39d908676457708cba3d
diff --git a/media/codec2/Android.mk b/media/codec2/Android.mk
index 82d739f..17f28ff 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 all-makefiles-under,$(call my-dir))
+include $(call first-makefiles-under,$(call my-dir))