msm8960: add qcom keystore engine

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

This reverts commit 3c10a4a0cd59c135167ba2ea5e59ae8d12b388db.

Change-Id: I2de14b6a0fa57b36b254c9b4e4d82e4e74581efe
Merge branch 'cm-11.0' into kk_mkt