Merge commit 'acd09985ff0da954f51d45045f81e876a63f7650' into HEAD

Change-Id: I8531c35c198af08fdd3af00f049ce3fedcbae912
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",
 }