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

Change-Id: I40791fcdc3c27e937070dffbe8347e1d9d5bf561