Removing extra options

Conflicts:

	src/com/android/settings/performance/PerformanceSettings.java