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

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

Change-Id: I48f69041796e880ee5c8354b4638d3649a853dda