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

Change-Id: I2ed4502449f8c003a2caff37d642b5774f79f4cc