Merge "Add unit tests for HBD variance 4x4 SSE4.1 optimization" into nextgenv2