Merge "Make media_ndk_headers buildable for native_bridge"