diff --git a/android/virtmgr/src/crosvm.rs b/android/virtmgr/src/crosvm.rs
index 4d19670..f9fbd16 100644
--- a/android/virtmgr/src/crosvm.rs
+++ b/android/virtmgr/src/crosvm.rs
@@ -369,6 +369,7 @@
     /// Callbacks to clients of the VM.
     pub callbacks: VirtualMachineCallbacks,
     /// VirtualMachineService binder object for the VM.
+    #[allow(dead_code)]
     pub vm_service: Mutex<Option<Strong<dyn IVirtualMachineService>>>,
     /// Recorded metrics of VM such as timestamp or cpu / memory usage.
     pub vm_metric: Mutex<VmMetric>,
diff --git a/build/microdroid/Android.bp b/build/microdroid/Android.bp
index 27d0246..3b0f122 100644
--- a/build/microdroid/Android.bp
+++ b/build/microdroid/Android.bp
@@ -201,15 +201,15 @@
     name: "microdroid_build_prop_gen_x86_64",
     srcs: [
         "build.prop",
-        ":system-build.prop",
+        ":buildinfo.prop",
     ],
     out: ["build.prop.out"],
-    cmd: "(echo '# build properties from system/build.prop' && " +
-        "grep ro\\.build\\.version\\.codename= $(location :system-build.prop) && " +
-        "grep ro\\.build\\.version\\.release= $(location :system-build.prop) && " +
-        "grep ro\\.build\\.version\\.sdk= $(location :system-build.prop) && " +
-        "grep ro\\.build\\.version\\.security_patch= $(location :system-build.prop) && " +
-        "grep ro\\.build\\.version\\.known_codenames= $(location :system-build.prop) && " +
+    cmd: "(echo '# build properties from buildinfo.prop module' && " +
+        "grep ro\\.build\\.version\\.codename= $(location :buildinfo.prop) && " +
+        "grep ro\\.build\\.version\\.release= $(location :buildinfo.prop) && " +
+        "grep ro\\.build\\.version\\.sdk= $(location :buildinfo.prop) && " +
+        "grep ro\\.build\\.version\\.security_patch= $(location :buildinfo.prop) && " +
+        "grep ro\\.build\\.version\\.known_codenames= $(location :buildinfo.prop) && " +
         "cat $(location build.prop) && " +
         "echo ro.product.cpu.abilist=x86_64 && " +
         "echo ro.product.cpu.abi=x86_64) > $(out)",
@@ -219,15 +219,15 @@
     name: "microdroid_build_prop_gen_arm64",
     srcs: [
         "build.prop",
-        ":system-build.prop",
+        ":buildinfo.prop",
     ],
     out: ["build.prop.out"],
-    cmd: "(echo '# build properties from system/build.prop' && " +
-        "grep ro\\.build\\.version\\.codename= $(location :system-build.prop) && " +
-        "grep ro\\.build\\.version\\.release= $(location :system-build.prop) && " +
-        "grep ro\\.build\\.version\\.sdk= $(location :system-build.prop) && " +
-        "grep ro\\.build\\.version\\.security_patch= $(location :system-build.prop) && " +
-        "grep ro\\.build\\.version\\.known_codenames= $(location :system-build.prop) && " +
+    cmd: "(echo '# build properties from buildinfo.prop module' && " +
+        "grep ro\\.build\\.version\\.codename= $(location :buildinfo.prop) && " +
+        "grep ro\\.build\\.version\\.release= $(location :buildinfo.prop) && " +
+        "grep ro\\.build\\.version\\.sdk= $(location :buildinfo.prop) && " +
+        "grep ro\\.build\\.version\\.security_patch= $(location :buildinfo.prop) && " +
+        "grep ro\\.build\\.version\\.known_codenames= $(location :buildinfo.prop) && " +
         "cat $(location build.prop) && " +
         "echo ro.product.cpu.abilist=arm64-v8a && " +
         "echo ro.product.cpu.abi=arm64-v8a) > $(out)",