Revert "derp"

This reverts commit 67ab455786c3274fb912dfa44862d76b0f1abdc3.
Revert "derp"

This reverts commit fc443b36e0c2214003881f8eea8a887dac013897.
Revert "reorder settings for HALO"

This reverts commit ee0291bf76c8d464991e04b1a859c416c8d334a3.
Revert "[1/2] Settings: HALO"

This reverts commit 1992dba98e4dc83cd46842e9071ff4968c87ef82.
Merge branch 'cm-11.0' of https://github.com/CM-i9300-builds/android_packages_apps_Settings into cm-11.0