Merge "Add building and installing of grep for vendor." am: 23bcbf040d
am: bb0a970036

Change-Id: Iae67462c6d6d17aea701d875d0838fd29c78a7f5