Revert "[infra] Roll clang to match the version used by Flutter"

build/config/android/config.gni

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # This file contains common system config stuff for the Android build.
 
 if (is_android) {
   if (!defined(default_android_sdk_root)) {
     default_android_sdk_root = "//third_party/android_tools/sdk"
     default_android_sdk_version = "22"
@@ skipping 44 matching lines @@
   android_sdk_build_tools =
       "${android_sdk_root}/build-tools/$android_sdk_build_tools_version"
 
   # Path to the SDK's android.jar
   android_sdk_jar = "$android_sdk/android.jar"
 
   zipalign_path = "$android_sdk_build_tools/zipalign"
 
   # Subdirectories inside android_ndk_root that contain the sysroot for the
   # associated platform.
-  if (current_cpu == "x64" || current_cpu == "arm64") {
-    _android_api_level = 22
-  } else {
-    _android_api_level = 16
-  }
+  _android_api_level = 16
   x86_android_sysroot_subdir =
       "platforms/android-${_android_api_level}/arch-x86"
   arm_android_sysroot_subdir =
       "platforms/android-${_android_api_level}/arch-arm"
   mips_android_sysroot_subdir =
       "platforms/android-${_android_api_level}/arch-mips"
   _android64_api_level = 21
   x86_64_android_sysroot_subdir =
       "platforms/android-${_android64_api_level}/arch-x86_64"
   arm64_android_sysroot_subdir =
@@ skipping 87 matching lines @@
   } else if (current_cpu == "x64") {
     android_app_abi = "x86_64"
   } else if (current_cpu == "arm64") {
     android_app_abi = "arm64-v8a"
   } else if (current_cpu == "mips64el") {
     android_app_abi = "mips64"
   } else {
     assert(false, "Unknown Android ABI: " + current_cpu)
   }
 
-  android_log_tag = "\"dart\""
+  android_log_tag = "\"flutter\""
 }