Revert "Attempt some fixes."

This reverts commit d05011dbbc6c6608f88e10590754bb55516adfd6.

Conflicts:
	packages/SystemUI/src/com/android/systemui/BatteryMeterView.java

Change-Id: I8394aa87cb4419996dc02a633ba7c063390385b8