Merge 55f74efe72becb88d6957ad8be86e027f34a31e7 on remote branch

Change-Id: I1328c438086a250d17cf5249d95ae30b89cb1fbb
diff --git a/Android.bp b/Android.bp
index 1f5f1e3..738258e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -112,6 +112,9 @@
     ],
     min_sdk_version: "29",
     afdo: true,
+    header_abi_checker: {
+        diff_flags: ["-allow-adding-removing-weak-symbols"],
+    },
 }
 
 // WARNING: deprecated