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

Change-Id: I02cc77ba673fd298623f44164da7b2b0957d9000