Settings: Remove unused code

Conflicts:
	AndroidManifest.xml
	res/xml/settings_headers.xml
	src/com/android/settings/Settings.java