am d020cf7f: am e3ec7541: Merge "Make client/app ids objects in the binder API"

* commit 'd020cf7f295eab3e5d2d89ed56dea1af53237f23':
  Make client/app ids objects in the binder API
tree: 4299c987e6cff9880ea5e2bd572a7c7c29286f23
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/