Merge "Fix: sanitizerRuntimeMutator is not run for host" am: 27fd541cf3

am: d493964e21

Change-Id: I4d24e58ed7a6630a2099053ea90670ceefc72d7d

cc/sanitize.go

@@ -667,10 +667,10 @@ func sanitizerRuntimeDepsMutator(mctx android.TopDownMutatorContext) {
 
 // Add the dependency to the runtime library for each of the sanitizer variants
 func sanitizerRuntimeMutator(mctx android.BottomUpMutatorContext) {
-	if mctx.Os() != android.Android {
-		return
-	}
 	if c, ok := mctx.Module().(*Module); ok && c.sanitize != nil {
+		if !c.Enabled() {
+			return
+		}
 		var sanitizers []string
 		var diagSanitizers []string