Revert "settings: Add dock battery support"

This reverts commit 390f16ade59e1ed517da612f65ff8c9dca1b2bb5.
Revert "Settings: remove force overflow button"

This reverts commit ad002fe8d97fe2026c0908043169d6c6e5e8a0cf.

Conflicts:
	src/com/android/settings/cyanogenmod/ButtonSettings.java
Revert "Forward Port Circle Battery"

This reverts commit 942daf80e2d0d60e18e7f71ec99c22f6e8621e99.

Conflicts:
	res/values/cm_strings.xml