Merge "Remove wchar_t-related compiler warnings when building the STLport sources"