Remove unneeded Halo option

Change-Id: Iacf168cb0b39b32bd99d156848b5895708014cb9
Merge "Remove unneeded Halo option" into jb3