Merge changes I653cc165,Icd0be731

* changes:
  Use new context HAL methods for all biometric operations.
  Remove useless type.