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

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