am 051f369a: Merge "Build BSD grep separately from toolbox."

* commit '051f369a14a405dc6dbaf708dc51a21c5629bf88':
  Build BSD grep separately from toolbox.