Merge "Fix strchr for basic non-sse case on x86"