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

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