Merge "Revert "Re-enable ASAN globals instrumentation for devices."" am: 20cf012ad1 am: 5006a72ec9

am: defb3a18a9

Change-Id: I230f7a1010f3eeb8aa20bb0ec1679060b12c4a62

cc/sanitize.go

@@ -451,6 +451,7 @@ func (sanitize *sanitize) flags(ctx ModuleContext, flags Flags) Flags {
 			// libraries needed with -fsanitize=address. http://b/18650275 (WAI)
 			flags.LdFlags = append(flags.LdFlags, "-Wl,--no-as-needed")
 		} else {
+			flags.CFlags = append(flags.CFlags, "-mllvm", "-asan-globals=0")
 			if ctx.bootstrap() {
 				flags.DynamicLinker = "/system/bin/bootstrap/linker_asan"
 			} else {