[automerger skipped] Merge "replacing include_dirs with header_libs" am:...

[automerger skipped] Merge "replacing include_dirs with header_libs" am: 270ceb4f am: 2329adc1 -s ours am: b7ae6a4c -s ours

am skip reason: Merged-In Id1007cf1395079af25bead9a9b4dd913a4be7f2f with SHA-1 9d3b8ce4 is already in history

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



Change-Id: I672671e5a9205d3ef38a191429a3d97e263e9c5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>