[automerger skipped] Merge "audioeffect: add missing sources to deserializer config file" am: 9d33c6344d am: 113b208692 am: f769a09b8a -s ours
am skip reason: Change-Id I0da109d637dac646ee43e2dd602ddfb0b21fa31d with SHA-1 160863fd37 is in history

Change-Id: Ia70f9f4cc1558d2ea2acc09c73095d2b29c9624f