Merge "Fix some more missing libc includes."