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

* commit '614e1f60f33f555769d06d6b47ef1bd93fc7d81c':
  Add a CleanSpec for grep/toolbox.