Merge "Revert "Handle multiple isolated uid to host uid mapping""
diff --git a/apex/tests/libstatspull/Android.bp b/apex/tests/libstatspull/Android.bp
index 82dba72..41c052e 100644
--- a/apex/tests/libstatspull/Android.bp
+++ b/apex/tests/libstatspull/Android.bp
@@ -54,7 +54,7 @@
     ],
     shared_libs: [
         "libbinder_ndk",
-        "statsd-aidl-ndk_platform",
+        "statsd-aidl-ndk",
     ],
     static_libs: [
         "libstatspull_private",
diff --git a/lib/libstatspull/Android.bp b/lib/libstatspull/Android.bp
index 3698a57..bf00942 100644
--- a/lib/libstatspull/Android.bp
+++ b/lib/libstatspull/Android.bp
@@ -37,7 +37,7 @@
     ],
     static_libs: [
         "libutils",
-        "statsd-aidl-ndk_platform",
+        "statsd-aidl-ndk",
     ],
     target: {
         android: {
diff --git a/statsd/Android.bp b/statsd/Android.bp
index bc711dc..f606438 100644
--- a/statsd/Android.bp
+++ b/statsd/Android.bp
@@ -101,7 +101,7 @@
         "libsysutils",
         "libutils",
         "server_configurable_flags",
-        "statsd-aidl-ndk_platform",
+        "statsd-aidl-ndk",
     ],
     shared_libs: [
         "libbinder_ndk",