Merge "Make media_ndk_headers buildable for native_bridge" into rvc-dev am: e943989e64 am: 0dd1ff0ffa

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

Change-Id: Ifed46faf139423566efed77b542e3c98eb267a94