Merge "Abandon plans to move to PCRE grep." am: 6e71b4a27c
am: 04fc5e3e1a

Change-Id: Idb76f69370be055a049285767f9926f0ba0e83ba