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

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