Merge "Define keymaster HAL v0.4."