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

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