Gett rid of stragglers

Change-Id: I1a27beaf35b2ea45baff14d73d1957784f1ea823
Settings: PerformanceControl from Omni [2/2]

Change-Id: Ife3b6a8642f5a6602762332be2751dd057a8ec97
Signed-off-by: STELIX <ssspinni@gmail.com>

Conflicts:
	Android.mk
	res/xml/settings_headers.xml
	src/com/android/settings/Settings.java
	src/com/android/settings/carbon/BootReceiver.java