Merge "vp9_svc_layercontext(): fix proto mismatch"