diff --git a/CleanSpec.mk b/CleanSpec.mk
index be26008155..3430346e7c 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -677,6 +677,9 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/symbols/data/fuzz/*)
 $(call add-clean-step, rm -rf $(HOST_OUT)/fuzz/*)
 $(call add-clean-step, rm -rf $(SOONG_OUT_DIR)/host/*/fuzz/*)
 
+# Change file layout of system_other
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system_other)
+
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
 # ************************************************