move to new vendor config

Change-Id: I9659f241b141a414e258e8fbb4a67ad984e78cbb
Revert "move to new vendor config"

This reverts commit 6de910f50e4de8760f4f6eb201030c2422658906.

Change-Id: Ibc2bf32aae611c27712900e2ead4b9d014673aae
update props list

Change-Id: Iddef37a03c1a1cf0b8e90508f9077f98af9e693a