Merge "API changes for Locale to OpenJDK8u60 (part 1/2)" am: 01614e4e7f
am: abc432fd09

Change-Id: Iebccf0f8b271649596066807f0a59f5fefb3ee94