Merge "audiopolicy: fix dynamic device & explicit routing management"