Snap for 4402171 from f1a79657c21ec4acade0657f3606a0c868b6866e to pi-release

Change-Id: I7d7f4d54691c4dd68bf6273aea4da9845792913f
diff --git a/Android.bp b/Android.bp
index 37b6f50..a7d74e3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -16,12 +16,7 @@
     export_include_dirs: ["."],
 
     target: {
-        linux_glibc: {
-            sanitize: {
-                misc_undefined: ["integer"],
-            },
-        },
-        android: {
+        linux: {
             sanitize: {
                 misc_undefined: ["integer"],
             },