diff --git a/CleanSpec.mk b/CleanSpec.mk
index 12f6654e0..f634ae353 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -697,6 +697,9 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/*.jar)
 # Remove symlinks for VNDK apexes
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/vndk-*)
 
+# Switch to symlinks for VNDK libs
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/vndk-*)
+
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
 # ************************************************