am 12ef4ba4: am 8c195ad7: Merge "Implement addAuthToken"

* commit '12ef4ba427e3a8a393ad664470ed190951bc0b6c':
  Implement addAuthToken
tree: e33c69874b5dec8ba9ed77b29dfe7d444a6a91fe
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/