Use unified branch for vendor

Change-Id: Iee716a13d004969884b01b3966b3a27d52b81dee