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

Change-Id: Ic76a3c268381e7bba202d761d9ee4bcfd25913cc