Merge "Fix addAuthToken api"
tree: a5faaa115d80a6c5daf8f24eaeec7a3935713025
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/