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

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

Change-Id: I5b97087ef14529f90f9132192ed874cf739d1ba5