am 615bd1f4: am 54009f7e: am 5d774594: Merge "ndk: Fix WCHAR_MIN / WCHAR_MAX definitions."

* commit '615bd1f449158db3198fd27e6b53b0cf42ae6891':
  ndk: Fix WCHAR_MIN / WCHAR_MAX definitions.