Merge TP1A.220328.001

Change-Id: I1b55f93398547a8fc63fa02bf64185f8de465582
diff --git a/bcinfo/Android.bp b/bcinfo/Android.bp
index 95f7f0d..13c27cd 100644
--- a/bcinfo/Android.bp
+++ b/bcinfo/Android.bp
@@ -82,7 +82,7 @@
         darwin: {
             shared_libs: ["libLLVM_android"],
         },
-        linux_glibc: {
+        host_linux: {
             allow_undefined_symbols: true,
         },
         host: {
diff --git a/lib/Android.bp b/lib/Android.bp
index 583afa0..7c53f60 100644
--- a/lib/Android.bp
+++ b/lib/Android.bp
@@ -63,7 +63,7 @@
         darwin: {
             shared_libs: ["libLLVM_android"],
         },
-        linux_glibc: {
+        host_linux: {
             static_libs: ["libLLVMLinker"],
             allow_undefined_symbols: true,
         },