Merge "VP9: Do not call vp9_adjust_mask() in vp9_setup_mask()"