Reserve space in mbstate to allow for proper wchar support

Bug: 14382788
Change-Id: If023ac9bb65f95135cae7ebe89147e3985a69a96
Merge "Reserve space in mbstate to allow for proper wchar support"
auto-merger: merge in from aosp/master