use consolidated vendor

Change-Id: I7bc879f82560e629cc25085358f4b3346a5b6d8b