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

Change-Id: Ifcf8b3cf89e3f8b6d703e2a73cac7b036d013318