Merge changes from topic "async_keystore"

* changes:
  Multithreaded Keystore
  Remove legacy functions from IKeystoreService.aidl