diff --git a/Android.bp b/Android.bp
index 8edd08a..e7f0d6c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -35,12 +35,12 @@
     "src/base/file_utils.cc",
     "src/base/metatrace.cc",
     "src/base/page_allocator.cc",
-    "src/base/sock_utils.cc",
     "src/base/string_splitter.cc",
     "src/base/string_utils.cc",
     "src/base/temp_file.cc",
     "src/base/thread_checker.cc",
     "src/base/time.cc",
+    "src/base/unix_socket.cc",
     "src/base/unix_task_runner.cc",
     "src/base/virtual_destructors.cc",
     "src/base/watchdog_posix.cc",
@@ -49,7 +49,6 @@
     "src/ipc/deferred.cc",
     "src/ipc/host_impl.cc",
     "src/ipc/service_proxy.cc",
-    "src/ipc/unix_socket.cc",
     "src/ipc/virtual_destructors.cc",
     "src/protozero/message.cc",
     "src/protozero/message_handle.cc",
@@ -161,12 +160,12 @@
     "src/base/file_utils.cc",
     "src/base/metatrace.cc",
     "src/base/page_allocator.cc",
-    "src/base/sock_utils.cc",
     "src/base/string_splitter.cc",
     "src/base/string_utils.cc",
     "src/base/temp_file.cc",
     "src/base/thread_checker.cc",
     "src/base/time.cc",
+    "src/base/unix_socket.cc",
     "src/base/unix_task_runner.cc",
     "src/base/virtual_destructors.cc",
     "src/base/watchdog_posix.cc",
@@ -175,7 +174,6 @@
     "src/ipc/deferred.cc",
     "src/ipc/host_impl.cc",
     "src/ipc/service_proxy.cc",
-    "src/ipc/unix_socket.cc",
     "src/ipc/virtual_destructors.cc",
     "src/perfetto_cmd/main.cc",
     "src/perfetto_cmd/perfetto_cmd.cc",
@@ -302,7 +300,6 @@
     "src/base/file_utils.cc",
     "src/base/metatrace.cc",
     "src/base/page_allocator.cc",
-    "src/base/sock_utils.cc",
     "src/base/string_splitter.cc",
     "src/base/string_utils.cc",
     "src/base/temp_file.cc",
@@ -311,6 +308,7 @@
     "src/base/test/vm_test_utils.cc",
     "src/base/thread_checker.cc",
     "src/base/time.cc",
+    "src/base/unix_socket.cc",
     "src/base/unix_task_runner.cc",
     "src/base/virtual_destructors.cc",
     "src/base/watchdog_posix.cc",
@@ -319,7 +317,6 @@
     "src/ipc/deferred.cc",
     "src/ipc/host_impl.cc",
     "src/ipc/service_proxy.cc",
-    "src/ipc/unix_socket.cc",
     "src/ipc/virtual_destructors.cc",
     "src/protozero/message.cc",
     "src/protozero/message_handle.cc",
@@ -3618,12 +3615,12 @@
     "src/base/file_utils.cc",
     "src/base/metatrace.cc",
     "src/base/page_allocator.cc",
-    "src/base/sock_utils.cc",
     "src/base/string_splitter.cc",
     "src/base/string_utils.cc",
     "src/base/temp_file.cc",
     "src/base/thread_checker.cc",
     "src/base/time.cc",
+    "src/base/unix_socket.cc",
     "src/base/unix_task_runner.cc",
     "src/base/virtual_destructors.cc",
     "src/base/watchdog_posix.cc",
@@ -3632,7 +3629,6 @@
     "src/ipc/deferred.cc",
     "src/ipc/host_impl.cc",
     "src/ipc/service_proxy.cc",
-    "src/ipc/unix_socket.cc",
     "src/ipc/virtual_destructors.cc",
     "src/protozero/message.cc",
     "src/protozero/message_handle.cc",
@@ -3809,7 +3805,6 @@
     "src/base/page_allocator.cc",
     "src/base/page_allocator_unittest.cc",
     "src/base/scoped_file_unittest.cc",
-    "src/base/sock_utils.cc",
     "src/base/string_splitter.cc",
     "src/base/string_splitter_unittest.cc",
     "src/base/string_utils.cc",
@@ -3825,6 +3820,8 @@
     "src/base/thread_checker_unittest.cc",
     "src/base/time.cc",
     "src/base/time_unittest.cc",
+    "src/base/unix_socket.cc",
+    "src/base/unix_socket_unittest.cc",
     "src/base/unix_task_runner.cc",
     "src/base/utils_unittest.cc",
     "src/base/virtual_destructors.cc",
@@ -3841,8 +3838,6 @@
     "src/ipc/host_impl_unittest.cc",
     "src/ipc/service_proxy.cc",
     "src/ipc/test/ipc_integrationtest.cc",
-    "src/ipc/unix_socket.cc",
-    "src/ipc/unix_socket_unittest.cc",
     "src/ipc/virtual_destructors.cc",
     "src/perfetto_cmd/perfetto_cmd.cc",
     "src/perfetto_cmd/rate_limiter.cc",