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