Merge "AudioFlinger: Remove conditional effect types"