[automerger skipped] Merge "audioflinger: fix missing EffectBase member init" am: 249dba6eb7 am: 428370d621 am: 58716c9315 -s ours
am skip reason: Change-Id I20de7712ff3701649c78da4e6172e58af3f1f625 with SHA-1 d9eb496977 is in history

Change-Id: Idf3bf0f3c82329261af9baac055813b021bdae58