Revert "Halo: Add master switch to disable Halo (2/2)"

This reverts commit fe55abe988d6af9be0e9fe2d938a9e9519c9ff34.

Conflicts:
	res/values/strings.xml
	res/xml/tool_bar_settings.xml
	src/com/android/settings/paranoid/Toolbar.java