Merge "Revert "Re-enable ASAN globals instrumentation for devices.""
diff --git a/cc/sanitize.go b/cc/sanitize.go
index 82e5a08..4687782 100644
--- a/cc/sanitize.go
+++ b/cc/sanitize.go
@@ -450,6 +450,7 @@
 			// 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 {