Ribbon Rework AXI0M

String derp

Conflicts:
	res/values/strings.xml

Patch Set 2: Derp. Forgot to move ArrangeRibbonTogglesFragment to right place

Change-Id: Ic5108ee7c59eb1e6310eb40fa4d14b28ba930c16

Conflicts:
	res/menu/ribbon.xml
	res/values/strings.xml
	src/com/android/settings/carbon/ArrangeRibbonTogglesFragment.java
	src/com/android/settings/carbon/RibbonTargets.java