Merge "Fix potential use-after-free in hw auth token handling." into mnc-dev
tree: 311619f021fea50c448e9a9629e3ab97b8bf1ff8
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/