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

Change-Id: I19cf5d2310156032ee55b71ef77a5c5627026854
Merge "Revert "Halo: Add master switch to disable Halo (1/2)"" into jb-mr2