am 4fa3e5ee: am e5499c53: am ae9621de: Merge "Fix wchar.h not to redefine WCHAR_MAX/WCHAR_MIN"

* commit '4fa3e5ee0db978a89e9571e182ea5a2851a99022':
  Fix wchar.h not to redefine WCHAR_MAX/WCHAR_MIN