Revert "Fixes to fit new app circle bar!"

This reverts commit c85e45bc936bf507d27b97bef1f0508faf5709f1.
Revert "[2/2] Settings: Implement App circle sidebar"

This reverts commit b87388af6b4fe1e93500c3b69f9c466d56e1ee10.

Conflicts:
	res/values/ag_strings.xml
Merge branch 'cm-11.0' of git://github.com/faleandroid/android_packages_apps_Settings-1 into cm-11.0
Merge branch 'cm-11.0' of git://github.com/faleandroid/android_packages_apps_Settings-1 into cm-11.0