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

Change-Id: I05ae825023ccee75d4250fae92452a2bed681274