Merge "Update java.net.URL to OpenJDK 8u121-b13."