am 598f9b2a: Merge "Add Keymaster 0.4 binder API"

* commit '598f9b2a19bf5adf834f9a0edd12d4b4bc7ea27d':
  Add Keymaster 0.4 binder API