Merge "Fix calc_highbd_psnr"