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

Change-Id: Ic39bbbdb2f15da406ad75dfa805d198b01f84581