move to new vendor config

Change-Id: I324d01f657d7134294f9bcecc717634ec5ab3759