Merge branch 'kk' of git://codeaurora.org/platform/hardware/qcom/keymaster into cm-11.0

Change-Id: I672bfaf0c681dacc677fbcc34279c4342e246ab4
keymaster: Fall back to legacy shared library location

Change-Id: I393a4b24aeb4dbfbee2d27261a7ed1c8495e19a3
keymaster: Change module name

Change-Id: Iddba11fae9bbfe03621606fe50574d60f38778f9
Merge remote-tracking branch 'cm/cm-11.0' into kitkat