Merge "audiopolicy: Add synchronization to EffectDescriptorCollection"