am 56388dbb: Merge "Switch keystore to binder"

* commit '56388dbb276fef1e0ccdfcd5a38ab9b946bb3734':
  Switch keystore to binder