Merge tag 'android-4.2.2_r1.2' of https://android.googlesource.com/platform/hardware/qcom/keymaster into cm-10.1

Android 4.2.2 release 1.2

# gpg: Signature made Wed 17 Apr 2013 01:00:30 PM PDT using DSA key ID 9AB10E78
# gpg: Can't check signature: public key not found
Merge tag 'android-4.3_r2.1' into cm-10.2

Android 4.3 release 2.1
keymaster: Fix the compilation issue for the MR2.

Add kernel headers to fix the compilation issue on MR2.

Change-Id: Icf7e060a2a6fad9e682efc42cdc942a560133bfb
keystore: Add missing kernel dependency

Change-Id: I4a454271bb0e7d973876e7c28949c303d5e05ca6
Merge tag 'android-4.4_r1' into cm-11.0

Android 4.4 Release 1.0