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

// Definitions exist in C++11

#if defined __cplusplus && __cplusplus < 201103L

typedef uint32_t char32_t;

typedef uint16_t char16_t;

typedef unsigned int   char32_t;

typedef unsigned short char16_t;

#endif

// Standard string functions on char16_t strings.