diff --git a/libs/binder/Android.bp b/libs/binder/Android.bp
index 2715d6a..05c32b3 100644
--- a/libs/binder/Android.bp
+++ b/libs/binder/Android.bp
@@ -296,3 +296,14 @@
         "liblog",
     ],
 }
+
+// TODO(b/183654927): initially empty lib to work around some merge conflicts
+cc_library {
+    name: "libactivitymanager_aidl",
+    srcs: [],
+    shared_libs: [
+        "libbinder",
+        "libutils",
+        "liblog",
+    ],
+}