Snap for 4413317 from 7dcf783b3cb22c4453755396204a74636cb0dd6c to pi-release

Change-Id: Ic3d90bbac55f541486225d90483bb5bd5080e230
diff --git a/Android.bp b/Android.bp
index 617955b..23ca486 100644
--- a/Android.bp
+++ b/Android.bp
@@ -9,6 +9,6 @@
         "-Wall",
         "-Werror",
     ],
-
-    cppflags: ["-std=c++98"],
+    export_include_dirs: ["."],
+    cpp_std: "c++98",
 }