Merge "OpenSSLSocket handshake overhaul" into dalvik-dev