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

Change-Id: Iad0bc73ed1ad4bf880fe585a5b3fcf8d4f2be229