Revert "Hide mutated variant in non-make builds."

This reverts commit 6147c6972a.

Rationale: first in group of commits that left aosp_x86_64 not
building. (See https://android-build.googleplex.com/builds/
submitted/4426589/aosp_x86_64-eng/latest/logs/build_error.log)

Bug: 30227045
Test: builds
Change-Id: I632869d13d09b43e2040da187d7ced4f05c332de

cc/sanitize.go

@@ -574,22 +574,22 @@ func sanitizerMutator(t sanitizerType) func(android.BottomUpMutatorContext) {
 						modules[1].(*Module).sanitize.Properties.InSanitizerDir = true
 						modules[1].(*Module).sanitize.SetSanitizer(cfi, false)
 					}
-				}
-				if mctx.AConfig().EmbeddedInMake() && !mctx.Device() {
-					if isSanitizerEnabled {
-						modules[0].(*Module).Properties.HideFromMake = true
-					} else {
-						modules[1].(*Module).Properties.HideFromMake = true
-					}
-				}
-				if !mctx.AConfig().EmbeddedInMake() || !mctx.Device() {
+				} else {
 					if isSanitizerEnabled {
 						modules[0].(*Module).Properties.PreventInstall = true
 					} else {
 						modules[1].(*Module).Properties.PreventInstall = true
 					}
 				}
-
+				if mctx.AConfig().EmbeddedInMake() {
+					if !mctx.Device() {
+						if isSanitizerEnabled {
+							modules[0].(*Module).Properties.HideFromMake = true
+						} else {
+							modules[1].(*Module).Properties.HideFromMake = true
+						}
+					}
+				}
 			}
 			c.sanitize.Properties.SanitizeDep = false
 		}