diff --git a/pvmfw/Android.bp b/pvmfw/Android.bp
index c855b34..3e45454 100644
--- a/pvmfw/Android.bp
+++ b/pvmfw/Android.bp
@@ -25,7 +25,8 @@
 }
 
 cc_binary {
-    name: "pvmfw",
+    name: "pvmfw_elf",
+    stem: "pvmfw",
     srcs: [
         "idmap.S",
     ],
@@ -46,3 +47,15 @@
     },
     apex_available: ["com.android.virt"],
 }
+
+raw_binary {
+    name: "pvmfw",
+    src: ":pvmfw_elf",
+    stem: "pvmfw.bin",
+    enabled: false,
+    target: {
+        android_arm64: {
+            enabled: true,
+        },
+    },
+}
diff --git a/vmbase/Android.bp b/vmbase/Android.bp
index c335bda..473103e 100644
--- a/vmbase/Android.bp
+++ b/vmbase/Android.bp
@@ -1,3 +1,7 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 rust_library_rlib {
     name: "libvmbase",
     host_supported: false,