am ad4661a0: Merge "Add Keymaster 1.0 binder methods"

* commit 'ad4661a0be6b627735116d26a32033c959852c40':
  Add Keymaster 1.0 binder methods