am f1171da9: am ad4661a0: Merge "Add Keymaster 1.0 binder methods"

* commit 'f1171da9b65d11b0d3f0a7a34bbe5c6485465e20':
  Add Keymaster 1.0 binder methods