Merge "Fix SSLCertificateSocketFactory.getDefaultCipherSuites."