diff --git a/microdroid/Android.bp b/microdroid/Android.bp
index 60965ef..2522679 100644
--- a/microdroid/Android.bp
+++ b/microdroid/Android.bp
@@ -49,7 +49,11 @@
         "logd",
         "run-as",
         "secilc",
-        "adbd",
+
+        // "com.android.adbd" requires these,
+        "libadbd_auth",
+        "libadbd_fs",
+
         "apexd",
         "debuggerd",
         "linker",
@@ -379,3 +383,8 @@
     name: "microdroid_cdisk_env.json",
     src: "microdroid_cdisk_env.json",
 }
+
+prebuilt_etc {
+    name: "microdroid_payload.json",
+    src: "microdroid_payload.json",
+}