diff --git a/packages/SystemUI/Android.bp b/packages/SystemUI/Android.bp
index dcdd9d0b73517..f63365bcd3690 100644
--- a/packages/SystemUI/Android.bp
+++ b/packages/SystemUI/Android.bp
@@ -45,6 +45,7 @@ android_library {
         "WindowManager-Shell",
         "SystemUIPluginLib",
         "SystemUISharedLib",
+	"SystemUI-statsd",
         "SettingsLib",
         "androidx.viewpager2_viewpager2",
         "androidx.legacy_legacy-support-v4",
@@ -108,6 +109,7 @@ android_library {
     static_libs: [
         "SystemUIPluginLib",
         "SystemUISharedLib",
+        "SystemUI-statsd",
         "SettingsLib",
         "androidx.viewpager2_viewpager2",
         "androidx.legacy_legacy-support-v4",
diff --git a/packages/SystemUI/shared/Android.bp b/packages/SystemUI/shared/Android.bp
index fe6e44b5de0af..592f6c2a0dff6 100644
--- a/packages/SystemUI/shared/Android.bp
+++ b/packages/SystemUI/shared/Android.bp
@@ -36,7 +36,6 @@ android_library {
 
     static_libs: [
         "PluginCoreLib",
-        "SystemUI-statsd",
     ],
 
     // Enforce that the library is built against java 7 so that there are