diff --git a/microdroid/Android.bp b/microdroid/Android.bp
index 4ddc03c..8ffb3cb 100644
--- a/microdroid/Android.bp
+++ b/microdroid/Android.bp
@@ -119,8 +119,7 @@
 logical_partition {
     name: "microdroid_super",
     sparse: true,
-    // TODO(b/181107248): remove this hard-coded value
-    size: "104857600",
+    size: "auto",
     default_group: [
         {
             name: "system",
diff --git a/virtmanager/Android.bp b/virtmanager/Android.bp
index 1b2aec1..37c3bcc 100644
--- a/virtmanager/Android.bp
+++ b/virtmanager/Android.bp
@@ -7,6 +7,7 @@
     crate_name: "virtmanager",
     srcs: ["src/main.rs"],
     edition: "2018",
+    prefer_rlib: true,
     rustlibs: [
         "android.system.virtmanager-rust",
         "libandroid_logger",