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

* commit 'aaa920d7969d9dd4b9e7871f2758d9092095bead':
  Make Unicode.h use types that match libc++.