Snap for 8319971 from 8a64afedfe3461e7c0f7706442007e26c1b43344 to t-keystone-qcom-release

Change-Id: Iac0c890ef3aae6ece52834680993d10427be2b42
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