Revert "Extended QS style options (1/2)"

This reverts commit fbe63eeeb02d22cefeb20df72de76533ccf82148.
Option to change number of QS columns - 1/2

[log]

Change-Id: I3fa8536c657d6acbfb8b253400e3b06c46ec521f

Conflicts:

	core/java/android/provider/Settings.java
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
quicksettings columns: respect landscape mode

Change-Id: I1086913c2b91a3672faad643ca2cee55a0d6929e