Revert "Roll Clang 218707:223109 (+r223211, +r223219, -r220714)" and follow-ups.

build/common.gypi

Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 26fef933deaabb659573d752228620f2b20271a8..c899e14d4bf06b80ac8bf7f7c478145b59e4caab 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -2521,9 +2521,6 @@
         # code generated by flex (used in angle) contains that keyword.
         # http://crbug.com/255186
         '-Wno-deprecated-register',
-
-        # TODO(hans): Get this cleaned up.
-        '-Wno-inconsistent-missing-override',
       ],
     },
     'includes': [ 'set_clang_warning_flags.gypi', ],
@@ -4238,7 +4235,7 @@
             'target_conditions': [
               ['_toolset=="target"', {
                 'cflags': [
-                  '-fsanitize-coverage=<(asan_coverage)',
+                  '-mllvm -asan-coverage=<(asan_coverage)',
                 ],
               }],
             ],
@@ -4609,6 +4606,16 @@
                   # TODO(eugenis): find a way to reenable this.
                   '-mllvm -asan-globals=0',
                 ],
+                'conditions': [
+                  ['target_arch=="arm"', {
+                    'ldflags': [
+                      # TODO(hans): The ASan runtime is no longer automatically
+                      # added to the link line when using -nostdlib. Can we
+                      # stop adding -nostdlib? (crbug.com/423429)
+                      '<!(cd <(DEPTH) && pwd -P)/<(make_clang_dir)/lib/clang/3.6.0/lib/linux/libclang_rt.asan-arm-android.so',
+                    ],
+                  }],
+                ],
               }],
               ['android_webview_build==0', {
                 'defines': [
@@ -4901,7 +4908,7 @@
             'target_conditions': [
               ['_toolset=="target"', {
                 'cflags': [
-                  '-fsanitize-coverage=<(asan_coverage)',
+                  '-mllvm -asan-coverage=<(asan_coverage)',
                 ],
               }],
             ],