am 585f1fd9: am 201ed62c: Merge "Add a CleanSpec for grep/toolbox."

* commit '585f1fd96f1f38772b09abcb63fa605bcb2c7b4c':
  Add a CleanSpec for grep/toolbox.