am a649fafb: Merge "Switch keystore to binder"

* commit 'a649fafbe8a83e9b86ea99f89b6554d93eb1937c':
  Switch keystore to binder