Tweak the moved cleanup_dirs to match the original.

Change-Id: I5cb240aa82a5d9ccea539927d355a1f07e728381