[automerger skipped] Merge "Make media_ndk_headers buildable for...

[automerger skipped] Merge "Make media_ndk_headers buildable for native_bridge" into rvc-dev am: e943989e am: 0dd1ff0f -s ours am: e57ec8ca -s ours am: 876a6d0c -s ours

am skip reason: Change-Id Icf9e789e46ed1bcf660230e3011e88fa5e933fb5 with SHA-1 47ff5564 is in history

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

Change-Id: I49bbc47161d1984a6577bc8c5c20ed01555cbd61