simplify vendor props

Change-Id: Id272156109f3ac90ed28966b9112a3fa5099d4c1
clean vendorsetup

Change-Id: I0513072ead38c64df194951b7362d3988b704700