Revert "Pie controls: Tweaking UX for pie service (2/2)"

This reverts commit 75abf658b6ab7518cc769d673240e23feb6ac657.
Revert "Merge Navigation Bar and Pie Controls button config (2/2)"

This reverts commit 2433cb7f952f2f1c9e80932e760f8617a1d7d95e.

Conflicts:
	res/values/strings.xml
	res/xml/system_settings.xml

Change-Id: Icca28d056e32bcf9f5a3269c1d3f35cd1365daa4
Revert "Bringing basic Pie controls to CyanogenMod. (2/2)"

This reverts commit e5bba18990fb2cbb4e777e6bd81a97254d909462.

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

Change-Id: I779615413f52b113b944f0e0166de3ed417c5055