Fix mismatched-tags error

These are exposed when frameworks/av/include is moved from being a
system include directory to a normal include directory.

Test: m -j checkbuild
Change-Id: Iaa8f3808d578ebedc75e863b9818cfbbec9080b2
Merged-In: Iaa8f3808d578ebedc75e863b9818cfbbec9080b2
11 files changed