Merge "API changes for updating Locale to OpenJDK8u60, part 2"
am: c35137ce36

Change-Id: Ibbf80ffe75bdbbc5da343e139bd80bc70afe4794