Merge "Revert "Fix makefile include hierarchy"" am: 6d65666280 am: 26bdf7774d am: bfc2c62309 am: 3bb3e06153 am: 5f1f6e0b69

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

Change-Id: Ib09c000f064e90f4dba6d8856398418a340e3933