Merge "lib: libc: correct strlcat implementation"