Merge "Use keymaster adapter to support older devices" into mnc-dev
tree: fe63a9e8221e0ea961f3149488524fe0a41956f6
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/