Revert commits to fix audiofx

Change-Id: Id2c46cb8454322e988c9c5d8db0d32b793ae1301