Merge branch 'jb43' of https://github.com/ParanoidAndroid/android_packages_apps_Settings into jb43-legacy

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

Change-Id: I00ea6dca2854b142b8f2746151ad82e4a73164cc
(cherry picked from commit cba14c21019d89d98f1ef8a108ab9abe21bf823f)