HALO cleanup

Conflicts:

	packages/SystemUI/src/com/android/systemui/statusbar/halo/Halo.java
	packages/SystemUI/src/com/android/systemui/statusbar/halo/HaloProperties.java