Merge "Move back to BSD grep, and make it available for recovery too."
am: af7e4567a3

Change-Id: I2dc4b70c11a74c436cfa9a4651fc3251ccc6790c