Merge "Fix wchar_t signedness problems found on x86-64."