Snap for 4386413 from 8e40af2e0a449d37f3951cb1cdab7dad477bf253 to pi-release

Change-Id: I909e3f3e5b0570e19b29d7ad2fb94de74677cd99
diff --git a/Android.bp b/Android.bp
index 81877c3..f2a671e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -42,13 +42,15 @@
     include_dirs: ["external/libcxx/include"],
     local_include_dirs:  ["include"],
     export_include_dirs: ["include"],
+    cflags: [
+        "-Wall",
+        "-Werror",
+    ],
     cppflags: [
         "-std=c++14",
         "-fexceptions",
-        "-Wall",
         "-Wextra",
         "-Wno-unused-function",
-        "-Werror",
     ],
     sanitize: {
         never: true,