Revert "moveto new vendor config"

This reverts commit 227e13ecf4045c79962b33d253931742f6a04188.

Change-Id: I49b5ad44290ca161f94c5be0c22c752aec11c751