Merge "Move psnrhvs function declaration to psnr.h" into nextgenv2