Snap for 4821244 from 16a15a748f94bbacf88f5268c29bef459e6e9edb to pi-release

Change-Id: I8771ed11fd2b61b6d4598d22174654bd9b051b45
diff --git a/Android.bp b/Android.bp
index 83a3586..2ee1616 100644
--- a/Android.bp
+++ b/Android.bp
@@ -22,6 +22,12 @@
         "-Wall",
         "-Werror",
     ],
+
+    target: {
+        android: {
+            cflags: ["-DLIBVINTF_TARGET"],
+        },
+    }
 }
 
 cc_library_static {
@@ -74,7 +80,6 @@
             srcs: [
                 "RuntimeInfo-target.cpp",
             ],
-            cflags: ["-DLIBVINTF_TARGET"],
         },
     }
 }