Merge "Make Unicode.h use types that match libc++."