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

Change-Id: I482b047e387c34487a031a4bb71d05799e31e621