Revert "NavigationBar: Custom height (2/2)"

This reverts commit ac724ad87db7c68ed2eeef855c8c63166a384862.

Conflicts:
	res/xml/system_settings.xml
	src/com/android/settings/cyanogenmod/SystemSettings.java