Fix tests dealing with retryable bodies.

Test them in a slightly more robust manner.
- Rely on the fallback from Modern TLS for the retry, instead
  of a fallback due to a closed socket.
- Use mode DISCONNECT_AFTER_READING_RESPONSE to make sure the
  response is consumed before being discarded.

Change-Id: I8227148e1fc04b7557a41ee6485ffe98efb77ace

Conflicts:
	luni/src/test/java/libcore/java/net/URLConnectionTest.java
Fix extra and comment ordering in ZipEntry reading

Change-Id: I99e6722ef898baa7f9a2d56e84e88aae5a6c9f4a
Update authentication tests.

Test for multiple schemes and multiple auth headers, but
insist that one of schemes is "Basic".

Fixes CTS tests
URLConnectionTest#testAuthenticateWithCommaSeparatedAuthenticationMethods
URLConnectionTest#testAuthenticateWithMultipleAuthenticationHeaders

Change-Id: Icdc30a5c52cc2c8e3b65abe402732658d4308a88
Test that timeouts are respected on recycled connections.

This is a renamed version of testGetKeepAlive, which wasn't
testing very much in its old form.

Change-Id: I08c46f577741817b7de714d362f3426d17984042

Conflicts:
	luni/src/test/java/libcore/java/net/URLConnectionTest.java
Better error messages for zlib errors

Most of the zlib inflater errors had a really descriptive name like
"data error," but more descriptive errors are put into the "msg" field
of the z_stream structure. Use that for error messages instead so we get
the underlying cause of the data error.

Additionally split out the code for ZipUtilities from the header into a
separate source file so things using NativeZipStream don't have to
forward declare.

Change-Id: Ifc12645b37f7aabc700e6a0766dee55b4c3609a0
Fix PriorityQueue.removeAt(.), call siftUp(.) if needed.

Bug: 10424240
Change-Id: I6bbe0bb4da008bc9b7c0b006985fa7d5631b094f
create a separate lib for jsr166.
Bug: 10390711

(cherry picked from commit d47cd7206917560c7f522ede128490819a96b143)

Change-Id: I2646530dad175e2efe81b3f926a4d78a901f76ee
Remove bogus @test comments that confuse vogar.

They should be @tests, but they're useless anyway. (If there weren't
so many, I'd remove all the @tests comments too.)

Change-Id: I6d34a77c48d7d0bac075758453fd0d29f6f9901c

Conflicts:
	harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/SelectorTest.java