Merge "Suppress -Wimplicit-fallthrough in aapt code"