Merge "Revert "Reclasify optimized ssim calculations as SSE2.""