Merge "vp9-skinmap. Some adjustments for model=1."