Merge "Fix bug #7173351 API REVIEW: android.util.LocaleUtil" into jb-mr1-dev