Merge "Build BSD grep separately from toolbox."