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

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

Change-Id: I46110c33f7729fdaebe132ebfb8d7d65636040ff