Merge "Make media_ndk_headers buildable for native_bridge" am: 1fa576bf62 am: fabeabe287 am: c749e3aa8c am: edf39cf9b8 am: 0ceb192fbe

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

Change-Id: I61b5dcc9e0b8fe30205bb94ca1979c7807b9d018