Merge changes I52418ade,Ic02102cb

* changes:
  Add argument to binder call to check key types
  Provide fallback for keymaster implementations
tree: 16f055f616e5f84fa5ecf9f2cc54ba61dc4ccf3a
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/