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

* commit '2f35f1fa51db20695be65668986e44dd80da9616':
  Update android-20 wchar.h up to bionic state.