move to new vendor config

Change-Id: I8113aa55cc6b4ecc73262b5144e35393ac1df7ff