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

Change-Id: If9a1fde493641c6c25cc0fa39b003c98f37baa7c