am c6b6c27c: am ab66d360: Merge "Fix mbrtoc32 test from tests/uchar_test.cpp for x86."

* commit 'c6b6c27caec6138b2d9c524a0287b5ae1e4553e3':
  Fix mbrtoc32 test from tests/uchar_test.cpp for x86.