Take ypg1 off nightlies and correct vendor files

Change-Id: I016649b47ea53d0b4b248f3da3ae9036f7fd47ea