Bring in AudioFX

Change-Id: Ic758a49fc14292fb57d31b577a3779c2412e55bd

Conflicts:
	default.xml