diff --git a/java/app.go b/java/app.go
index 78d526db4..3f72ec9b2 100644
--- a/java/app.go
+++ b/java/app.go
@@ -208,7 +208,7 @@ func AndroidAppFactory() android.Module {
 		&module.aaptProperties,
 		&module.appProperties)
 
-	android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibCommon)
+	InitJavaModule(module, android.DeviceSupported)
 	return module
 }
 
@@ -261,7 +261,6 @@ func AndroidTestFactory() android.Module {
 		&module.appTestProperties,
 		&module.testProperties)
 
-	android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibCommon)
-
+	InitJavaModule(module, android.DeviceSupported)
 	return module
 }