Add g2 variants to vendorsetup

Change-Id: I698814e2f4cd9ccc2797768fae7cf387fd95c639