Changes to fit new HALO Mods implementation

Change-Id: I340b2cf0293d2605300c8d51af28ecbab9b968e0

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