diff --git a/Android.bp b/Android.bp
index 77fad2b..3289c41 100644
--- a/Android.bp
+++ b/Android.bp
@@ -8731,6 +8731,14 @@
         "libz",
       ],
       stl: "libc++_static",
+      dist: {
+        targets: [
+          "sdk_repo",
+        ],
+      },
+      strip: {
+        all: true,
+      },
     },
   },
 }
@@ -9250,29 +9258,3 @@
         "statslog_perfetto.cpp",
     ],
 }
-
-cc_genrule {
-  name: "trace_processor_shell.stripped",
-  device_supported: false,
-  host_supported: true,
-  cmd: "$(location tools/strip_android_host_binary.py) $(in) -o $(out)",
-  enabled: false,
-  compile_multilib: "64",
-  tool_files: [
-    "tools/strip_android_host_binary.py",
-  ],
-  dist: {
-    targets: [
-      "sdk_repo",
-    ],
-  },
-  target: {
-    linux: {
-      out: [
-        "trace_processor_shell.stripped",
-      ],
-      srcs: [":trace_processor_shell"],
-      enabled: true,
-    },
-  },
-}