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

Change-Id: I55ae235e9f1aa0e1442549408206fb9dcc0b6d91