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

Change-Id: Icbb7ecb75e0b652a8088f3127bf19e09c46c834e