am ed556858: Merge "Make sure we keep building grep now it\'s broken out from toolbox."

* commit 'ed556858262a7311f0145f1d1c605f7cec7c18c4':
  Make sure we keep building grep now it's broken out from toolbox.