move to new vendor config

Change-Id: I664dc2d52238a7db2f5ecb0198d32591cf05b708