Merge commit '5648c97b' into dalvik-dev * commit '5648c97b': Remove explicit SSLSocket.startHandshake