am 7d4b717b: Merge "Remove wchar_t-related compiler warnings when building the STLport sources"

* commit '7d4b717b3b48998a13070b383a98c972aec00781':
  Remove wchar_t-related compiler warnings when building the STLport sources