Merge "Missing 1.8 javax.net.ssl.SSLSocketFactory.createSocket method"