Merge "Fix makefile include hierarchy" am: 4b34c69843 am: 42d908a943 am: 08ada20294 am: 610d84cd40 am: 113776fc77

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

Change-Id: Id8df6d340661a0299faaf18f4acb08ea59c05a0b