Merge "Add keymaster2 HAL."