Merge "replacing include_dirs with header_libs" am: 270ceb4f

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



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