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

Change-Id: Ia8e11923c94b0b48789a73891b84d65eced7cdfe