Revert "Settings : Toggle expanded desktop for navbar"

This reverts commit d527c9162051d72b9faf8ffa361068bb17233df7.
Revert "Settings : NavigationBar Customization"

This reverts commit 356ed10d7520d4eb245c4cb523d11ac0fb4fb060.

Conflicts:
	res/values/strings.xml
	src/com/android/settings/cyanogenmod/NavBar.java
	src/com/android/settings/cyanogenmod/SystemSettings.java