Merge "Implement addAuthToken"
tree: e33c69874b5dec8ba9ed77b29dfe7d444a6a91fe
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/