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

* commit '05d8a22c2d75e8945e372ef0bb251fabb055a3df':
  Build BSD grep separately from toolbox.