Merge "drop old owners"
diff --git a/Android.bp b/Android.bp
index b37e26f..594f2b5 100644
--- a/Android.bp
+++ b/Android.bp
@@ -132,9 +132,13 @@
         darwin: {
             enabled: false,
         },
-        linux_glibc: {
+        glibc: {
             cppflags: [
                 "-DHAVE_A_OUT_H",
+            ],
+        },
+        linux_glibc: {
+            cppflags: [
                 "-Wno-unused-parameter",
             ],
             srcs: [