Merge "Switch DRM HAL policy to _client/_server"