Merge "Move the upstream-netbsd libc files into the correct directory."