Fix Java 7 build.

See http://bugs.sun.com/view_bug.do?bug_id=6904536
Bug: 8992787

(cherry-picked from a9a297845620cfe56bbe3b9f8de1331b7ec54574)

Change-Id: I14ff930b02914563493fbcd971f3393fa0c12105
Merge "Fix Java 7 build."
Do not throw exception on Mac#reset

OpenSSLMac was not checking whether it was initialized before
dereferencing its macKey field. This caused callers to Mac#reset()
before Mac#init() to get a NullPointerException.

Bug: https://code.google.com/p/android/issues/detail?id=58179
Change-Id: I8523983fec578079a66a04d585c1ddbe7732575e
Merge "Do not throw exception on Mac#reset"
Fix exceptions thrown in tests

Change-Id: Ia1327511d4347550111334fb858053a8cd8c3109
Merge "Fix exceptions thrown in tests"
Add CAP_BLOCK_SUSPEND to OS constants

Bug: 10901016
Change-Id: I162bde82bce9fca8eabc7168a172d3d8365e1578
Merge "Add CAP_BLOCK_SUSPEND to OS constants"
Conscrypt: add SHA-224 with tests

SHA-224 has made a comeback in the latest StandardNames documentation.
This change adds tests for SHA-224 and also Conscrypt providers for
things we have code paths to support.

Change-Id: I8c200082ff76ee4ae38b6efaa16e6741b33b7f5b
Merge "Conscrypt: add SHA-224 with tests"
Conscrypt: correct key selection with no sigAlg

The KeyManagerImpl was changed to support the "EC_EC" and "EC_RSA" key
types in the StandardNames document. The intention of those aliases are
to require a certain signature type. If it is missing, it should accept
any signature type as before. However, it was erroneously requiring the
same signature type as the key type if it was missing. This causes RSA
client certificates signed by an EC key, for instance, to fail.

Bug: 10966884
Change-Id: I298bf65ac4c607ae13e24b44fb1b52ec341f9fcf
Merge "Conscrypt: correct key selection with no sigAlg"
KeyGeneratorTest: add key sizes for HmacSHA224

Change-Id: Ibd19193646a861744df14bb323fd9d2a5d28f3fc
Add benchmark for SSL loopback

Change-Id: Ifb05ee34f4398ad61e047d1a7ecfcea9a787b6ca
Merge "Add benchmark for SSL loopback"
Merge "KeyGeneratorTest: add key sizes for HmacSHA224"
Remove unsupported Cipher modes

OpenSSL silently ignores the padding modes when specified for stream
ciphers, but apparently Java does not.

Change-Id: Icd92122d63b3b8e99d704e8193414dda5057146d
Merge "Remove unsupported Cipher modes"
I before E, except after C

...and some other cases

Change-Id: I45e2770fd4c734b5aefba124d3c09eef47294b43
Merge "I before E, except after C"