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

* commit '54009f7e95e2f9fffbcc771b4495a72045c5f381':
  ndk: Fix WCHAR_MIN / WCHAR_MAX definitions.