Merge "lib: libc: string: Remove old version of strtok"