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

Change-Id: Iaeab7c7c8d24b68d2be75ddd3f6055ba78be906d