am 38beb106: am a11517f6: am 00300a11: Merge "Fix addAuthToken api"

* commit '38beb106f37034c32298f258e07cddf3ce377fcd':
  Fix addAuthToken api
tree: 9ece73e057e227558d546d017fde861b20fc729d
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/