Merge "Use the apex image when the device config asks for it." am: 56405f8071

am: b32c872116

Change-Id: Ic40b3c44bc9c9d85f532878475f14489d5743069

java/dexpreopt.go

@@ -98,6 +98,9 @@ func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, dexJarFile android.Mo
 
 	global := dexpreoptGlobalConfig(ctx)
 	bootImage := defaultBootImageConfig(ctx)
+	if global.UseApexImage {
+		bootImage = apexBootImageConfig(ctx)
+	}
 
 	var archs []android.ArchType
 	for _, a := range ctx.MultiTargets() {