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

Change-Id: I83d7b8b34690d374d64f272ad9c22148dca1b379