Merge #11842: [build] Add missing stuff to clean-local