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

* commit '1629f9543a48e93515395a10c50d0394f8be2774':
  Add Keymaster 0.4 binder API