Merge "Moving OpenSSLSocketImpl native code to NativeCrypto (and other clearnup)" into dalvik-dev