Revert "status bar battery percentage: option for percentage inside icon"

This reverts commit 62ee62c7c8e31f9bfde987a11f046f463e104426.

Conflicts:
	res/xml/system_settings.xml