am e4ac8feb: Merge "libc: cleanup strchr"

* commit 'e4ac8feb58ed1f963db9a1f32fa74a06a1f594f2':
  libc: cleanup strchr