Merge "vp9-svc: Bugfix for svc in non-rd variance partition."