Merge stage-aosp-master into pi-dev-plus-aosp
am: f889723bbd

Change-Id: Idf617e80d6ee9f136f951822ae94a0effbb69fc0
diff --git a/libhwcomposer/Android.bp b/libhwcomposer/Android.bp
index 384e7e2..7857e48 100644
--- a/libhwcomposer/Android.bp
+++ b/libhwcomposer/Android.bp
@@ -30,6 +30,7 @@
         "-Wno-unused-parameter",
         "-Wno-missing-field-initializers",
         "-fexceptions",
+        "-Wno-implicit-fallthrough", // in format.cpp
     ],
 
     shared_libs: [