Merge tag 'android-4.3_r2.1' into cm-10.2

Android 4.3 release 2.1
Merge tag 'android-4.4_r1' into cm-11.0

Android 4.4 Release 1.0
Add heartbeat extension bounds check.

A missing bounds check in the handling of the TLS heartbeat extension
can be used to reveal up to 64k of memory to a connected client or
server.

Thanks for Neel Mehta of Google Security for discovering this bug and to
Adam Langley <agl@chromium.org> and Bodo Moeller <bmoeller@acm.org> for
preparing the fix (CVE-2014-0160)

Change-Id: I177a2d47857a6747d9462f868e4292ff347d6f82