msm8960: add qcom keystore engine

Change-Id: I609dd5a84f02aa5f9bb10b1bd95fb340609f6e6a
Revert "msm8960: add qcom keystore engine"

This reverts commit 3c10a4a0cd59c135167ba2ea5e59ae8d12b388db.

Change-Id: I2de14b6a0fa57b36b254c9b4e4d82e4e74581efe
Fix jactivelte CameraWrapper crash

- jactive camera doesn't seem to have KEY_RECORDING_HINT, at least
  initially. Added check that the vaue read wasn't null

Change-Id: Ie970e5705df3d5d3065c27322007d2530ea63d6f
cmhw: add DisplayColorCalibration tunables

Change-Id: Ifb49365d95507f886a70e96c72697b5a5618c073
Merge "cmhw: add DisplayColorCalibration tunables" into cm-11.0
DisplayColorCalibration: Increase range

Along with associated kernel patch, increases the range of the display
tuner. Adjusts the "/sys/class/misc/gammacontrol/tuner" node to contain
an RGB triplet from 0 to 120, with "60 60 60" being nominal values

Individual gamma corrections can be also be found by tweaking the nodes
in /sys/class/misc/gammacontrol

Change-Id: Iad498fe8e89fe135e968f78b096a3d1c85c0a4ab
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_device_samsung_msm8960-common into kitkat