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

Change-Id: Ida98e1236cd30c9a30938fbb3842c63496650bd6