move to new vendor config

Change-Id: I181764e53c6ce4cff009f35f0935bdd6f66f5e8e