Sync java.util.concurrent library up to 12.06.2013.

CouncurrentHashMap was skipped from this sync.

Change-Id: I29c67698a2e706b22e3cb5920c5fe91f1f15461c
Implement java.util.Objects.

Bug: 3484927
Change-Id: I759b10ff42ebbc5849b174241fa3d9b004e10959
Bring Character.UnicodeBlock up to Unicode 6.0.

Bug: 3484927
Bug: 9656330
Change-Id: I34dbf3398ed955a6c621e154a7c0e4c0b51b9ebd
Fix ZipFile local file entry parsing.

The file name length is given in both the central directory entry
and the local file entry, with no consistency check. ZipInputStream
and the VM's native code both use the local file entry's value but
ZipFile was using the value from the central directory.

This patch makes ZipFile behave like the other two. (Even though,
unlike the others, ZipFile actually has enough information to detect the
inconsistency and reject the file.)

Bug: https://code.google.com/p/android/issues/detail?id=57851
Bug: 9950697
Change-Id: I1d58ac523ad2024baff1644d7bf822dae412495d
(cherry picked from commit 257d72c1b3a69e0af0abe44801b53966dbf7d214)
Cache the few unique Attributes.Name values.

Google+ was seeing ~8k duplicate names. Their real fix is to not
accidentally cause us to parse their jar manifest, but we shouldn't
be unnecessarily wasteful in the common case, should anyone actually
need their jar manifest.

Change-Id: Ia06b0964956332975e5efd079d96aa76ba605f48

Conflicts:
	luni/src/main/java/java/util/jar/InitManifest.java
Un-@hide various APIs.

Bug: 3484927
Change-Id: I4cda326a31240135d883528d9cb976a9db084234
Add @SafeVarargs.

Bug: 3484927
Change-Id: I3c235502d6542767a2f5818b203ff7520073a053
Clean up two unnecessary 'implements' clauses.

Bug: 3484927
Change-Id: I29ce16d47f880399894c84940dbe9f091831fa06
Add missing @Override annotations

Change-Id: I4c5772c9549375beeb0e4f269bd61d623fca7e35
(cherry picked from commit 49992f5003aac55e1b1cf54769abc93630ccde93)

Conflicts:
	dex/src/main/java/com/android/dex/TypeList.java
Fix java.lang.Throwable's protected constructor.

Bug: 3484927
Change-Id: Ib8088ec50a767390b6416b73a0e66887ece5c719
Fix Short.compare.

Bug: 3484927
Change-Id: I53fbed8d7060556ade960174d567e975ebc70928
Fix CharBuffer.subSequence return type.

Bug: 3484927
Change-Id: I06dae03b0803d1373e268e854e9e0e4b6c59e13a
Fix non-blocking SocketChannel connects.

There are many reasons why the initial connect(2) may have resulted
in a ConnectException, only one of which (EINPROGRESS) means we haven't
yet failed.

Bug: https://code.google.com/p/android/issues/detail?id=56684
Change-Id: I2115998bce9043f076418fb0d1c22a26e04ee2e1
Fix the SocketChannel accept locking behavior.

Fixes a harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/ServerSocketChannelTest
test that had been failing since we turned it back on.

Change-Id: I76cbc5edc1ab9edc4d2818bd23649f4b906d662c
JarFile: finish support for authenticated attributes

There was an unfinished code path to use Authenticated Attributes to
verify JAR files. This finishes it up and allows PKCS#7 signatures with
that field instead of a direct digest on the encapsulated data.

The description of Authenticated Attributes can be found in RFC 3852
section 9 referred to as "authAttrs."

Bug: 9625223
Change-Id: Ia2c8fc09d39fbb67c1bdcdfe087f185471dcedd4
Permit content lengths greater than 2 GiB

Change-Id: Id14de316d1eff3443ff9c91f098fe7ae4b6561cd
Fix Selector to allow read and write at the same time.

Bug: https://code.google.com/p/android/issues/detail?id=57456
Change-Id: I29e6688aafce886803bbbd12793df3ab952459c8
Fix a Selector bug and a test bug.

Bug: 10127357
Change-Id: I6d80586b243d6bd45fda5a36c043600d7528e891

Conflicts:
	harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/SelectorTest.java
Rename InitManifest to ManifestReader.

Change-Id: I4bb53d7a625324c5b7ca28a3dc0759f2b107825f
Fix Selector's handling of POLLHUP.

Bug: 10310709

(cherry picked from commit ed3322f25d79b6607fc314d75f96d46b7c783f43)

Change-Id: I3f9ce080170ed49f46650420673ca27863381852