Merge "Add a placeholder EXTRA_OPTIONS to inject more tradefed options"
diff --git a/CleanSpec.mk b/CleanSpec.mk
index be5abe7..21034ad 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -601,6 +601,8 @@
 
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libnpt.so)
 
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*)
+
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
 # ************************************************