Replace our broken wcswcs with the working upstream one.

Change-Id: I2952684df5674d10f0564d92c2cd42597725c0e3
Merge "Replace our broken wcswcs with the working upstream one."
Add mbtowc and fix mbrtowc.

Change-Id: I48786cd82587e61188d40f6fd6e11ac05e857ae9
Merge "Add mbtowc and fix mbrtowc."
Merge remote-tracking branch 'aosp/master' into fml-master