[automerger skipped] Merge "audioflinger: refactor EffectModule class" am: 186f9ccf66 am: c69cab48b3 am: 0c9ce88bf4 -s ours
am skip reason: Change-Id Id91cef9db6b4f6be0d2e77a8b4afcbdc7234e519 with SHA-1 4170955999 is in history

Change-Id: Id6ecd1f4dabad4129c6c738b34f8bd5c65ef6a27