Revert "Add space between battery and clock"

This reverts commit 3925db617dbc87d4f7cfe80367fa8bfa09d87c0f.
Revert "Fixes for device specific dock support"

This reverts commit 43b80df7aea2fa6fa973ca3c5d639ee3f5582fd1.

Fixes battery icon issues.

Conflicts:

	core/res/res/values/config.xml
	packages/SystemUI/res/values/dimens.xml

Change-Id: Iaa655fd3d501c6405b8b24d4edaefb3d74c97fbc