Merge "Fix incorrect keymaster device usage."
tree: c86d021f27bae9f1d9111418c57e088792237a30
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/