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

Change-Id: Ie1367fafd33df1fea7ab3a01a50cab2b0e2febe8