Revert "Merge branch 'HYBRID' of git://github.com/CarbonDev/android_packages_apps_Settings into jb2"

This reverts commit 4ce5974ba1bffea4240c8a335af3674506cbc514, reversing
changes made to e622b87aceb3c39931501011b6a5190dd1cf57cf.

Conflicts:
	res/values/strings.xml
	res/xml/interface_settings.xml