Merge "libc: fix memchr implementation"