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

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

Change-Id: I66392a0beaee7bd071e197c43455fb9833a549e6