am cabc0202: Merge changes I52418ade,Ic02102cb

* commit 'cabc02029fb9027df7dcde287396ddcc11f3c279':
  Add argument to binder call to check key types
  Provide fallback for keymaster implementations