Remove unneeded Halo option

Change-Id: Iacf168cb0b39b32bd99d156848b5895708014cb9
Carbon Fibers: ES Translations

Change-Id: I37ece314706f133424205a2ccbc8d9b8a00461d9
Merge "Remove unneeded Halo option" into jb3
Merge remote-tracking branch 'upstream/jb3' into jb3

Conflicts:
	res/values-es/strings.xml