Merge changes I31b6a66a,I682e5c98

* changes:
  Switch from old style KM2 HAL to new KM3 HAL
  Add Keymaster 3.0 binderized Trusty HAL