Sync with upstream grep.

Change-Id: Ie1da2e95ee7e3513afb87f357be983dc80cd1515
4 files changed