Circle Battery: Fix miss matched font & circle color

Change-Id: I539d762ce49947a19e6821748e08f3fc2ce71162
Merge remote branch 'omni/android-4.4' into android-4.4