am ac982541: Merge "Refresh locale.h from bionic"

* commit 'ac982541a91fb9999b55a52ef0e269731968c231':
  Refresh locale.h from bionic