DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master

Bug: 120502534
Change-Id: I6ee732fbb825cc5b20221c28f2a06e16cbc82da2
diff --git a/hals/keymaster/Android.bp b/hals/keymaster/Android.bp
index f9c4aa3..b956e20 100644
--- a/hals/keymaster/Android.bp
+++ b/hals/keymaster/Android.bp
@@ -28,6 +28,7 @@
     cflags: [
         // Needed for compiling BoringSSL.
         "-Wno-gnu-anonymous-struct",
+        "-Wno-implicit-fallthrough",  // in proto_utils.cpp:836
         "-Wno-nested-anon-types",
     ],
     shared_libs: [