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

Change-Id: I36959e11ac30d638e16e57fdac4fe8ff5638ed68