Move to CM base

Conflicts:
	res/xml/system_ui_settings.xml
	src/com/android/settings/SettingsPreferenceFragment.java