Merge "API: Update ResourceBundle to OpenJDK8u60" am: 9d16a441a6
am: 29319829fb

Change-Id: I02fba9b316fed6ee248c69f97570da8d1f1ac531