am 0810f8a6: am 7e3d050a: am 2f35f1fa: Merge "Update android-20 wchar.h up to bionic state."

* commit '0810f8a6ec30dc3d8351ec204ed0988b27390a3c':
  Update android-20 wchar.h up to bionic state.