Merge "Revert "Add VPX_TUNE_SSIM and VPX_TUNE_PSNR enums""