Merge remote-tracking branch 'settings/kitkat-remix' into remix-legacy

Conflicts:
	AndroidManifest.xml
	res/values/pa_strings.xml
	src/com/android/settings/SoundSettings.java