Merge "Remove more trivial char/wchar_t printf differences."