Merge "NFC: Fix implicit fallthrough warning."

tools/aapt/AaptAssets.cpp

@@ -301,6 +301,7 @@ int AaptLocaleValue::initFromDirName(const Vector<String8>& parts, const int sta
                         break;
                     }
                     // This is not alphabetical, so we fall through to variant
+                    [[fallthrough]];
                 case 5:
                 case 6:
                 case 7:

tools/aapt/Android.bp

@@ -71,8 +71,6 @@ cc_library_host_static {
     cflags: [
         "-Wno-format-y2k",
         "-DSTATIC_ANDROIDFW_FOR_TOOLS",
-        // Allow implicit fallthroughs in AaptAssets.cpp until they are fixed.
-        "-Wno-error=implicit-fallthrough",
     ],
 
     srcs: [