Merge "Revert "Switch to PCRE grep.""
am: 78f5431ff1

Change-Id: I024285b635fdbf4279da37ebe82312c26c0f1adc