Merge "Enable computing PSNRHVS for hbd build" into nextgenv2