Merge "Fix wchar.h not to redefine WCHAR_MAX/WCHAR_MIN"