Merge "Switch Keymaster HAL policy to _client/_server"