Merge "Fix android.net.SSLTest"