am ec58d454: am 00f82e18: am 930e9fee: am ac982541: Merge "Refresh locale.h from bionic"

* commit 'ec58d454f276ac87524c78ea18577eed68d99fdf':