Keep current battery icon and update halo on theme change and fix builds

Change-Id: I9e1d2ddfde2bed0726c35601345f081d2a35016e

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