diff --git a/CleanSpec.mk b/CleanSpec.mk
index f95f0a74e9..be5abe71aa 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -599,6 +599,8 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libvixld.so)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/dex_bootjars)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/dex_bootjars_input)
 
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libnpt.so)
+
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
 # ************************************************
diff --git a/target/product/runtime_libart.mk b/target/product/runtime_libart.mk
index c337e9120b..fa35d433ed 100644
--- a/target/product/runtime_libart.mk
+++ b/target/product/runtime_libart.mk
@@ -38,11 +38,6 @@ PRODUCT_PACKAGES += \
     libicui18n \
     libicuuc \
 
-# TODO(b/124498388): This currently needs to be in /system/lib for the debugger
-# transport to work.
-PRODUCT_PACKAGES += \
-    libnpt
-
 # Android Runtime APEX module.
 PRODUCT_PACKAGES += com.android.runtime