diff --git a/CleanSpec.mk b/CleanSpec.mk
index 91e6e6605b..45ca7c18fa 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -525,6 +525,9 @@ $(call add-clean-step, rm -f $(HOST_OUT)/bin/aidegen)
 # Remove perfprofd
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/bin/perfprofd)
 
+# Remove incorrectly created directories in the source tree
+$(call add-clean-step, find system/app system/priv-app system/framework system_other -depth -type d -print0 | xargs -0 rmdir)
+
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
 # ************************************************