[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 -s ours am: ab1b2f56 -s ours am: 40aac00f -s ours am: 019a4d75 -s ours

am skip reason: Change-Id Icf9e789e46ed1bcf660230e3011e88fa5e933fb5 with SHA-1 0987929f is in history

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

Change-Id: I67f76db5b6bd3757b419525700f3cecffd622428