Merge "Switch to PCRE grep."
am: 9aca01907d

Change-Id: Ica9a6728968661172ac141d8f0e404f7c80feb5a