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

Change-Id: Iae9b28dc7380e599215afbdb137eec95cce36e9b