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

This reverts commit fe55abe988d6af9be0e9fe2d938a9e9519c9ff34.

Conflicts:
	src/com/android/settings/paranoid/Toolbar.java

Change-Id: I678c8a9547009f3f8bc613460939348697a18449
String fixes

... and spanish translations

Change-Id: I5dd049fc443b830b0b7b74e57020253b8c94087a

Conflicts:
	res/values-es/strings.xml
Small cleanup

Conflicts:
	src/com/android/settings/paranoid/Toolbar.java

Change-Id: If66951f32835f07af4cc1e69b6a98132aafc0ea7
Remove duplicate entries

Change-Id: If668bcad4508a99ed6057950124f945964568eae