Add grouper back to vendorsetup

 *le derp

Change-Id: I7d6e8150bc043fe44b5159a1ef9e599ec9464c3f
Merge remote-tracking branch 'upstream/kitkat' into kitkat