Merge "fix build w/only mmx+sse enabled"