Revert "Settings: Add back expanded desktop settings."

This reverts commit 0a45483b349cfea9466f1eb777360d83ab1d0a4c.

Conflicts:
	res/values/cm_arrays.xml
	res/xml/blackout_settings.xml
	src/com/android/settings/cyanogenmod/SystemUiSettings.java

Change-Id: Ic34358edf4e441842dc58794342c0a6ec231a4b1
Build fixes for recent reverts

Change-Id: Iab8313d995be13259b219b5368cf280f5442f281