Merge "Go back to BSD grep for now." am: 6420c7d130 am: c897ee0042
am: 2580948047

Change-Id: I1546b87e3f520809a7ca60e5cd258764d94ee5d9