am 056ef407: am b060ae05: Merge "Revert "Add Keymaster 0.4 binder methods""

* commit '056ef407473a82ee688a3520bca4622feb5a5b8b':
  Revert "Add Keymaster 0.4 binder methods"