snappoint cleanup

Change-Id: I794446db52f0033b65c08b082f0ac6e77b9e3f97

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java