Merge "Merge "API: Update ResourceBundle to OpenJDK8u60" am: 9d16a441 am: 29319829 am: 49d903da" into nyc-mr1-dev-plus-aosp