Use module name as intermediates name for android_app modules

Use foo.apk instead of package.apk for the intermediate package for
a module named foo.

Fixes: 122996822
Test: m checkbuild
Change-Id: I38058a54038e1c2eeaefc0f0e7f450a74a3e96a7
diff --git a/java/app.go b/java/app.go
index 4bae78a..e44737e 100644
--- a/java/app.go
+++ b/java/app.go
@@ -261,7 +261,7 @@
 
 	certificates = append([]Certificate{a.certificate}, certificateDeps...)
 
-	packageFile := android.PathForModuleOut(ctx, "package.apk")
+	packageFile := android.PathForModuleOut(ctx, ctx.ModuleName()+".apk")
 	CreateAppPackage(ctx, packageFile, a.exportPackage, jniJarFile, dexJarFile, certificates)
 
 	if !a.Module.Platform() {