Merge "Re-enable ASAN globals instrumentation for devices." am: 68c9eed6b2 am: 88cddcf297

am: b580aec045

Change-Id: Ib5f4f47e25505158f646c1b4b8c693360e183a8f

cc/sanitize.go

@@ -446,7 +446,6 @@ 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 {