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

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

Change-Id: Ic7266783f0814e71cc59b433b0dc6b68bca70170