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

Change-Id: I424b2328c9cd5fbc9fa1920eed734067aa96b958