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

Change-Id: I3804fa96bf222f0931c04dd8f0de1487e4f3358b