Merge TP1A.220310.002

Change-Id: Icc91f222e97cc6ae333090f125a1d56c08aeb097
diff --git a/libc/Android.bp b/libc/Android.bp
index 98e3594..61712ad 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -82,7 +82,7 @@
 
             shared: {
                 // For backwards-compatibility, some arm32 builtins are exported from libc.so.
-                static_libs: ["libclang_rt.builtins-arm-android-exported"],
+                static_libs: ["libclang_rt.builtins-exported"],
             },
 
             // Arm 32 bit does not produce complete exidx unwind information