Merge "Use _client and _server for Audio HAL policy"