clean vendorsetup

Change-Id: I213570cd9ce619821cafe0846406e52d998142c1
simplify vendor props

Change-Id: I064184308912df82d4ec8328a7800546f2fe28e2