diff --git a/target/product/generic/Android.bp b/target/product/generic/Android.bp
index 288ac2a2a7..3057137b8e 100644
--- a/target/product/generic/Android.bp
+++ b/target/product/generic/Android.bp
@@ -742,6 +742,11 @@ system_image_defaults {
             "update_engine_client",
         ],
         default: [],
+    }) + select(release_flag("RELEASE_UPROBESTATS_MODULE"), {
+        true: [],
+        default: [
+            "uprobestats", // base_system internal
+        ],
     }),
     multilib: {
         common: {
@@ -894,12 +899,7 @@ system_image_defaults {
                 "android.system.virtualizationservice-ndk",
                 "libgsi",
                 "servicemanager",
-            ] + select(release_flag("RELEASE_UPROBESTATS_MODULE"), {
-                true: [],
-                default: [
-                    "uprobestats", // base_system internal
-                ],
-            }),
+            ],
         },
         both: {
             deps: [