Merge "audioflinger: refactor EffectModule class"