Use splitted vendor

Change-Id: If86decdb0371d3a8b0ecd287cd87a1404a9c6656