base: layout circle battery percent really in the center

There is no need to use strokeWidth in this layout calculation

Change-Id: I68471c5f63b49e815f305bc3d5bd86b67afeb647
merge changes from Omni 4.4 into local branch

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

Change-Id: Ie977212001b96ac5b4adf3f060c0b11ce12ac07e