Snap for 6680365 from 2697f4ea794fefbfd21c4990ab4514ee8a3fed7d to rvc-d1-release

Change-Id: Ibcab4ae754fbe46f741411b5df95ee028bf520c3
diff --git a/audio/Android.bp b/audio/Android.bp
index e26b595..8365aad 100644
--- a/audio/Android.bp
+++ b/audio/Android.bp
@@ -2,6 +2,8 @@
     name: "libaudio_system_headers",
     host_supported: true,
     vendor_available: true,
+    // TODO(b/153609531): remove when no longer needed.
+    native_bridge_supported: true,
 
     header_libs: ["libcutils_headers"],
     export_header_lib_headers: ["libcutils_headers"],
diff --git a/camera/Android.bp b/camera/Android.bp
index 041360d..fdd9b0f 100644
--- a/camera/Android.bp
+++ b/camera/Android.bp
@@ -3,6 +3,8 @@
 cc_library_shared {
     name: "libcamera_metadata",
     vendor_available: true,
+    // TODO(b/153609531): remove when no longer needed.
+    native_bridge_supported: true,
     vndk: {
         enabled: true,
     },