SystemUI: Fix battery indicator alignment

Before: http://i.imgur.com/WEz7pPa.png
After: http://i.imgur.com/BkvQ3Df.png

Change-Id: I7ed9f79863eeebd3dd2ba44ae95d413d4d5ebe9e

Conflicts:
	packages/SystemUI/res/layout/status_bar.xml