diff --git a/java/androidmk.go b/java/androidmk.go
index b9e4298..ccb5109 100644
--- a/java/androidmk.go
+++ b/java/androidmk.go
@@ -33,9 +33,6 @@
 		} else {
 			fmt.Fprintln(w, "LOCAL_PREBUILT_MODULE_FILE :=", library.implementationAndResourcesJar.String())
 		}
-		if library.installFile == nil {
-			fmt.Fprintln(w, "LOCAL_UNINSTALLABLE_MODULE := true")
-		}
 		if library.dexJarFile != nil {
 			fmt.Fprintln(w, "LOCAL_SOONG_DEX_JAR :=", library.dexJarFile.String())
 		}
diff --git a/java/java.go b/java/java.go
index 9c4bd86..7e82c59 100644
--- a/java/java.go
+++ b/java/java.go
@@ -1395,7 +1395,7 @@
 	j.deviceProperties.UncompressDex = j.shouldUncompressDex(ctx)
 	j.compile(ctx)
 
-	if Bool(j.properties.Installable) || ctx.Host() {
+	if (Bool(j.properties.Installable) || ctx.Host()) && !android.DirectlyInAnyApex(ctx, ctx.ModuleName()) {
 		if j.deviceProperties.UncompressDex {
 			alignedOutputFile := android.PathForModuleOut(ctx, "aligned", ctx.ModuleName()+".jar")
 			TransformZipAlign(ctx, alignedOutputFile, j.outputFile)
