Merge "Add a CleanSpec for grep/toolbox."