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

* commit 'b060ae059cb9f891af49e93aa0d546b2e5a838a8':
  Revert "Add Keymaster 0.4 binder methods"