Merge "Update android-20 wchar.h up to bionic state."