am e4163e96: Merge "Switch keystore to binder"

* commit 'e4163e96e0ee31c6e78434114cc1dcf4cd3ab5bd':
  Switch keystore to binder