Update dependencies and fix vendor

Change-Id: I1c87eb82f213adf79d8670e2d630f742448f7e34