Merge "Fix wchar.cpp signed/unsigned comparison build failure."