Merge changes Id13b97f4,I1d342725 * changes: The subfunctions are only defined for sse2 Unlike non-hbd variance, opt2 is never used