Merge "Remove a flavor of SSIM that is never really used." into nextgenv2