Merge "Fix a wchar.wcstombs_wcrtombs test failure."