Intergrate AudioFX into settings

Conflicts:
	src/com/android/settings/SettingsActivity.java