diff --git a/Android.bp b/Android.bp
index e861797..de4d3b3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -405,8 +405,7 @@
     ],
 
     srcs: [
-        "binder_bindings/android/brillo/IUpdateEngine.aidl",
-        "binder_bindings/android/brillo/IUpdateEngineStatusCallback.aidl",
+        ":libupdate_engine_client_aidl",
         "client_library/client.cc",
         "client_library/client_binder.cc",
         "parcelable_update_engine_status.cc",
@@ -414,6 +413,15 @@
     ],
 }
 
+filegroup {
+    name: "libupdate_engine_client_aidl",
+    srcs: [
+        "binder_bindings/android/brillo/IUpdateEngine.aidl",
+        "binder_bindings/android/brillo/IUpdateEngineStatusCallback.aidl",
+    ],
+    path: "binder_bindings",
+}
+
 // update_engine_client (type: executable)
 // ========================================================
 // update_engine console client.