Merge "grep is now toybox grep."
am: d543c8ca11

Change-Id: Ie2ace15b034fad308666f0bfabec24cc7a55695c