Quicktile row option:set 3,4,5 tiles per row (2/2)

Change-Id: I9a953f087e54e259a1f3df0b9fa914611f7ce761

Conflicts:
	AndroidManifest.xml
	res/values/spirit_arrays.xml
	res/values/spirit_strings.xml
	res/xml/quick_settings_panel.xml
	src/com/android/settings/quicksettings/QuickSettingsTiles.java
Revert "[1/2] Add option to change size of QS ribbon bar"

This reverts commit 225e3b1114ecee816908e045d983ec9bec9ce0d0.

Conflicts:
	res/values/cm_arrays.xml
Revert "QS: Make it possible to show smaller tiles (2/2)"

This reverts commit de3d953f07fb3e7a86582e01d0e67dfe1e5b15bb.

Conflicts:
	res/values/cm_strings.xml
	res/xml/quick_settings_panel.xml