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

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

Change-Id: Ibaa61edad60077978d65baade42672d4ad40096a