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

* commit '00f82e18c6d393d57dc1440cbc3fe9b6652ed38a':
  Refresh locale.h from bionic