Snap for 8362632 from b7ba111e8c54beb68b59a59f424ffe42781ee293 to tm-release

Change-Id: I6e2df4f27ce1a1d43114caf7619065506e384e67
diff --git a/Android.bp b/Android.bp
index 3cc8e2f..e0cd159 100644
--- a/Android.bp
+++ b/Android.bp
@@ -147,7 +147,7 @@
                 "src/common/musl/include",
             ],
         },
-        linux_glibc: {
+        host_linux: {
             cppflags: [
                 "-Wno-unused-parameter",
             ],
@@ -197,7 +197,7 @@
         darwin: {
             enabled: false,
         },
-        linux_glibc: {
+        host_linux: {
             srcs: [
                 "src/common/linux/http_upload.cc",
                 "src/common/linux/libcurl_wrapper.cc",
@@ -223,7 +223,7 @@
         darwin: {
             enabled: false,
         },
-        linux_glibc: {
+        host_linux: {
             cflags: [
                 "-Wno-missing-field-initializers",
                 "-Wno-pointer-arith",
@@ -259,7 +259,7 @@
         darwin: {
             enabled: false,
         },
-        linux_glibc: {
+        host_linux: {
             cppflags: [
                 "-DHAVE_A_OUT_H",
                 "-Wno-implicit-fallthrough",