Merge "Small updates to Android-changed code in javax.net.ssl"