HALO cleanup

Conflicts:
	packages/SystemUI/res/drawable-nodpi/bubble_l_custom.9.png
	packages/SystemUI/res/drawable-nodpi/bubble_r_custom.9.png

Change-Id: I21e2535c6ae2fdc8e03bd7fe07b6a9a8751884d8