Conflicts:
	libcore/regex/src/main/java/java/util/regex/Pattern.java
	vm/oo/Class.c

Merge commit '275acdff64a58f407cec552e7027cb07414b48ef' into eclair-plus-aosp

* commit '275acdff64a58f407cec552e7027cb07414b48ef':
  Copy Froyo's version of MulticastSocketTest to Eclair for CTS.

Partners are seeing test failures from the old tests, which were very bogus.

Conflicts:
	libcore/regex/src/main/java/java/util/regex/Pattern.java

It was found during long runs of stability tests of our
messaging applications that something in the platform was
leaking global references. The leaks were tracked down to
the Open SSL implementation in the Apache Harmony library
that currently resides under Dalvik.

In commit f68a91f63595904de706fe068c8c5f336d61dc85 code that “touches native SSL Sessions” in OpenSSLSocketImpl.java were
made synchronized by locking the OpenSSLSocketImpl class. Unfortunately, the same lock was used for instance counting, which
lead to situations where the native calls could end up blocking the garbage collector. That was fixed in commit
f681a0fc7db58aeead2d6970a717d8a466c1b516.
But it looks like we have run into a similar situation as in the latter case above, again. In the former commit, above, a
synchronization block was added to OpenSSLSessionImpl#finalize as well. So, what we see now is a crash where the garbage
collector is blocked from finalizing an OpenSSLSessionImpl object because of a native call in OpenSSLSocketImpl. Please see
the crash stack below.
The solution we see is to remove the unnecessary synchronized block in OpenSSLSessionImpl#finalize.
Removing the synchronization block is safe as in the cases where the OpenSSLSocketImpl needs to touch the sessionId it holds
a reference to a living OpenSSLSessionImpl object. The OpenSSLSessionImpl object cannot be collected as it lives and
therefore the synchronization on the OpenSSLSessionImpl.class is not needed.

01-14 03:40:37.288 I/dalvikvm(16601): "Thread-9" prio=5 tid=17 NATIVE
01-14 03:40:37.288 I/dalvikvm(16601):   | group="main" sCount=1 dsCount=0 s=N obj=0x2e5b5f00 self=0x178438
01-14 03:40:37.288 I/dalvikvm(16601):   | sysTid=16608 nice=10 sched=0/0 handle=1541464
01-14 03:40:37.288 I/dalvikvm(16601):   at org.apache.harmony.xnet.provider.jsse.OpenSSLSocketImpl.nativeconnect(Native
Method)
01-14 03:40:37.288 I/dalvikvm(16601):   at
org.apache.harmony.xnet.provider.jsse.OpenSSLSocketImpl.startHandshake(OpenSSLSocketImpl.java:305)
01-14 03:40:37.288 I/dalvikvm(16601):   at
org.apache.harmony.xnet.provider.jsse.OpenSSLSocketImpl$SSLInputStream.<init>(OpenSSLSocketImpl.java:502)
01-14 03:40:37.288 I/dalvikvm(16601):   at
org.apache.harmony.xnet.provider.jsse.OpenSSLSocketImpl.getInputStream(OpenSSLSocketImpl.java:443)
01-14 03:40:37.298 I/dalvikvm(16601):   at com.android.email.mail.transport.MailTransport.open(MailTransport.java:161)
01-14 03:40:37.298 I/dalvikvm(16601):   at com.android.email.mail.transport.SmtpSender.open(SmtpSender.java:128)
01-14 03:40:37.298 I/dalvikvm(16601):   at com.android.email.mail.transport.SmtpSender.sendMessage(SmtpSender.java:207)
01-14 03:40:37.298 I/dalvikvm(16601):   at
com.android.email.MessagingController.sendPendingMessagesSynchronous(MessagingController.java:1751)

...

01-14 03:40:37.298 I/dalvikvm(16601): "HeapWorker" daemon prio=5 tid=5 MONITOR
01-14 03:40:37.298 I/dalvikvm(16601):   | group="system" sCount=1 dsCount=0 s=N obj=0x2d7e8e60 self=0x155268
01-14 03:40:37.298 I/dalvikvm(16601):   | sysTid=16602 nice=0 sched=0/0 handle=1132792
01-14 03:40:37.298 I/dalvikvm(16601):   at
org.apache.harmony.xnet.provider.jsse.OpenSSLSessionImpl.finalize(OpenSSLSessionImpl.java:-1)
01-14 03:40:37.298 I/dalvikvm(16601):   at dalvik.system.NativeStart.run(Native Method)

Merge commit '0e9d568ec6b946e77bc0ec1903acac1ef916e6d1' into eclair-plus-aosp

* commit '0e9d568ec6b946e77bc0ec1903acac1ef916e6d1':
  Mark libcore cert tests using expired certs as known failures.

Bug 2322662

Change-Id: If35a5a75f664535bd4eb97cf11a6afe5b0e5b4a9