Merge "BSD grep: sync with upstream."
am: a42823b264

Change-Id: I5cbc85a29fe9092861dc6853e13c4030de17e748