diff --git a/apex/statsd/Android.bp b/apex/statsd/Android.bp
index 3b196925b91c0..2f3e2acb5d7ac 100644
--- a/apex/statsd/Android.bp
+++ b/apex/statsd/Android.bp
@@ -21,6 +21,8 @@ apex {
 apex_defaults {
     native_shared_libs: [
         "libstats_jni",
+        "libstatspull",
+        "libstatssocket",
     ],
     binaries: ["statsd"],
     java_libs: [
diff --git a/cmds/statsd/Android.bp b/cmds/statsd/Android.bp
index 5fe64c42186fe..73a8f666b78eb 100644
--- a/cmds/statsd/Android.bp
+++ b/cmds/statsd/Android.bp
@@ -302,6 +302,11 @@ cc_test {
     static_libs: [
         "libgmock",
         "libplatformprotos",
+
+        // TODO(b/149842105): Make libstatssocket shared and remove libcutils once statsd_test is
+        // moved to the apex.
+        "libstatssocket",
+        "libcutils",
     ],
 
     proto: {
@@ -311,7 +316,6 @@ cc_test {
 
     shared_libs: [
         "libprotobuf-cpp-lite",
-        "libstatssocket"
     ],
 
 }