Merge "Add mbtowc and fix mbrtowc."