Merge "Fix installation path for asan libraries"

am: 27807b5415

Change-Id: Ie30e9e5b8b884525bd88525eb9683afd6193ee9b

cc/cc.go

@@ -873,6 +873,9 @@ func (c *Module) InstallInData() bool {
 	if c.installer == nil {
 		return false
 	}
+	if c.sanitize != nil && c.sanitize.inData() {
+		return true
+	}
 	return c.installer.inData()
 }
 

cc/sanitize.go

@@ -353,9 +353,6 @@ func sanitizerMutator(t sanitizerType) func(android.BottomUpMutatorContext) {
 			if c.isDependencyRoot() && c.sanitize.Sanitizer(t) {
 				modules := mctx.CreateVariations(t.String())
 				modules[0].(*Module).sanitize.SetSanitizer(t, true)
-				if mctx.AConfig().EmbeddedInMake() && !c.Host() {
-					modules[0].(*Module).sanitize.Properties.InData = true
-				}
 			} else if c.sanitize.Properties.SanitizeDep {
 				if c.Host() {
 					modules := mctx.CreateVariations(t.String())