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

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