Merge "audiopolicy: Move surround configuration to xml"