Merge "Integrate upstream changes from 8u121-b13 in URLClassLoader" am: dfd9c008 am: 45d3a6e5 am: 89a3dc9b am: 5150f53e Change-Id: If0ddc5d60d48514fdad04e9e12031e2fc117bc46