Snap for 8730993 from 42e2a0711186eebb77d2a273660381931e8e0c16 to mainline-tzdata3-release

Change-Id: I76f9efb8cfa5d1b2f1befd9936a676c13c233cbe
diff --git a/Android.bp b/Android.bp
index 4befb96..de529f2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -105,7 +105,15 @@
             ],
         },
 
-        host_linux: {
+        linux_glibc: {
+            local_include_dirs: [
+                "linux",
+            ],
+
+            cflags: ["-Werror"],
+        },
+
+        linux_bionic: {
             local_include_dirs: [
                 "linux",
             ],