Merge "libc: cleanup strchr"