Merge "Don't dexpreopt APEX variant modules"

am: 72d009e1ec

Change-Id: Ieb1c2c3b4a54f7d756adac816286ed4ff1cfb17a

java/dexpreopt.go

@@ -85,6 +85,11 @@ func (d *dexpreopter) dexpreoptDisabled(ctx android.ModuleContext) bool {
 		return true
 	}
 
+	// Don't preopt APEX variant module
+	if am, ok := ctx.Module().(android.ApexModule); ok && !am.IsForPlatform() {
+		return true
+	}
+
 	// TODO: contains no java code
 
 	return false