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

* commit '930e9feeda4f71c13735dc8441e553dfbc4aa4a1':
  Refresh locale.h from bionic