Merge "vp9_mcomp.c static analysis issues"