Merge "vp10 cleanup: remove svc code"