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

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