Merge changes I52418ade,Ic02102cb

* changes:
  Add argument to binder call to check key types
  Provide fallback for keymaster implementations