am cbafa3d3: Merge "Add Keymaster 0.4 binder methods"

* commit 'cbafa3d3c4cd39118380af2076b6eab12d6beedf':
  Add Keymaster 0.4 binder methods