Merge "Fix vp9_psnrhvs.c build error"