Merge "Change SSLCertificateSocketFactoryTest.testCreateSocket host" into gingerbread