Turn it up to Eleven

Change-Id: I064f307da29e2fd8e02a7dfe8b663860ee9aed3a
(cherry picked from commit 23591df89346400e8b486f99be019c6260562c11)

Conflicts:
	default.xml
Bring in AudioFX

Change-Id: Ic758a49fc14292fb57d31b577a3779c2412e55bd
(cherry picked from commit 83334c97431760f2c7bca245eb25177e7ebb0e7d)

Conflicts:
	default.xml