Fix mbstate_t strict-aliasing violations.
Merge remote-tracking branch 'mw/aosp-5.0' into aosp-5.0