am 7e5c7b95: am baab180c: Merge "Do not typedef char16_t if it is a keyword."

* commit '7e5c7b9567ffa7efce13a84ea19c5865cbf5b4c4':
  Do not typedef char16_t if it is a keyword.