DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master

Bug: 120848293
Change-Id: Id42cb6811de6f1cb56abf9a8cc31d297e83f81f8
diff --git a/media/codecs/base/SimpleC2Component.cpp b/media/codecs/base/SimpleC2Component.cpp
index d6a62a7..cf80ffa 100644
--- a/media/codecs/base/SimpleC2Component.cpp
+++ b/media/codecs/base/SimpleC2Component.cpp
@@ -102,7 +102,7 @@
         case kWhatInit: {
             int32_t err = thiz->onInit();
             Reply(msg, &err);
-            // fall-through
+            [[fallthrough]];
         }
         case kWhatStart: {
             mRunning = true;