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