Merge "Integrate upstream changes forgotten in the update to OpenJDK 8u60" am: 26b04a70 am: c752ed00 am: 39c630f1 Change-Id: Ic416d92e58d19e40e1c4f05f2073fd6ccab394c1