Snap for 4413317 from 7dcf783b to pi-release

Change-Id: Ic3d90bbac55f541486225d90483bb5bd5080e230

Android.bp

@@ -9,6 +9,6 @@ cc_library_shared {
         "-Wall",
         "-Werror",
     ],
-
-    cppflags: ["-std=c++98"],
+    export_include_dirs: ["."],
+    cpp_std: "c++98",
 }