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

* commit '7e3d050add2d534b6e48353362cf7598f5f8f3f7':
  Update android-20 wchar.h up to bionic state.