diff --git a/apex/statsd/Android.bp b/apex/statsd/Android.bp
index 0e9311034ee07..86a3a7d2222e1 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: ["vold"],
     java_libs: [
diff --git a/cmds/statsd/Android.bp b/cmds/statsd/Android.bp
index 93522d4ff0a66..4991a955b9de6 100644
--- a/cmds/statsd/Android.bp
+++ b/cmds/statsd/Android.bp
@@ -299,6 +299,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: {
@@ -308,7 +313,6 @@ cc_test {
 
     shared_libs: [
         "libprotobuf-cpp-lite",
-        "libstatssocket"
     ],
 
 }