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

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