s/product-services/product_services/g

Attempting to reduce the number of different spellings we have for
"product services" partition in the codebase.

Bug: 112431447
Test: m
Change-Id: I6debd3f5f5abc4bd1e22f2ef11c5fe131915976c
Merged-In: I6debd3f5f5abc4bd1e22f2ef11c5fe131915976c
diff --git a/CleanSpec.mk b/CleanSpec.mk
index fa664ba..61550b8 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -495,6 +495,10 @@
 
 $(call add-clean-step, rm -rf $(SOONG_OUT_DIR)/.intermediates/system/vold)
 
+# Remove product-services related files / images
+$(call add-clean-step, find $(PRODUCT_OUT) -type f -name "*product-services*" -print0 | xargs -0 rm -rf)
+$(call add-clean-step, find $(PRODUCT_OUT) -type d -name "*product-services*" -print0 | xargs -0 rm -rf)
+
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
 # ************************************************