Merge 6a04e795cc9ed2b38527acd468eea9252cb6f139 on remote branch

Change-Id: I174f200f653c8850260fe82b9c31eeb3a88d81e2
diff --git a/Android.bp b/Android.bp
index 2aa5844..e2cb961 100644
--- a/Android.bp
+++ b/Android.bp
@@ -40,6 +40,8 @@
         "-Werror",
     ],
     vendor_available: true,
+    // TODO(b/153609531): remove when no longer needed.
+    native_bridge_supported: true,
     vndk: {
         enabled: true,
     },