am bde6c2bb: am b1a12188: Merge "Define keymaster HAL v0.4."

* commit 'bde6c2bb3fca4bc0665701ac99fa2b5b9673a6d6':
  Define keymaster HAL v0.4.