Revert "Bring in CMs 3 real Circle battery && also circle dotted batt. [2/2]"

This reverts commit 55318de39cb13295174e87e0d6055919979f9b26.

Conflicts:

	res/values/arrays.xml
	res/values/strings.xml

Change-Id: I5b0997b18e2ebb41a5581309423d4b20ac009e85