Merge "grep: fix ASan heap-buffer-overflow." am: acf9cfbf80 am: 2b0467de5d
am: c5134f93f1

Change-Id: I4611cb966f736bf4a69c2bfa14ed86b396c54661