am 475e05fb: am cbafa3d3: Merge "Add Keymaster 0.4 binder methods"

* commit '475e05fbf73a8aa63ef2f9f88f61255b4b7977bf':
  Add Keymaster 0.4 binder methods