vmbase: Keep base target names for ELF not bin

Rename the targets to be more consistent:

 - m pvmfw     -> builds pvmfw
 - m pvmfw_bin -> builds pvmfw.bin
 - m pvmfw_img -> builds pvmfw.img

Test: TH
Change-Id: I3eaea21609166409c7b5bfe3aa9122c32b229521
diff --git a/pvmfw/Android.bp b/pvmfw/Android.bp
index eab9474..5bcafd5 100644
--- a/pvmfw/Android.bp
+++ b/pvmfw/Android.bp
@@ -15,8 +15,7 @@
 }
 
 cc_binary {
-    name: "pvmfw_elf",
-    stem: "pvmfw",
+    name: "pvmfw",
     defaults: ["vmbase_elf_defaults"],
     srcs: [
         "idmap.S",
@@ -33,8 +32,9 @@
 }
 
 raw_binary {
-    name: "pvmfw",
-    src: ":pvmfw_elf",
+    name: "pvmfw_bin",
+    stem: "pvmfw.bin",
+    src: ":pvmfw",
     enabled: false,
     target: {
         android_arm64: {