Merge "Add ALPN support to SSL socket factory"