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

* commit 'afa310427e04f067976e5b979e2cceb3d759bf3f':
  Fix strchr for basic non-sse case on x86