Merge "Refresh locale.h from bionic"