Merge "Fix vp10 highbd psnr calculation" into nextgenv2