Merge "Add a missing include for char16_t"