Merge "Move custom SSLSocketFactory into emailcommon"