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

Change-Id: Id25c5050bb798ec206e86a83260a3bee9510e52c