Revert "CircleBattery fix layout for statusbar font size change - II"

This reverts commit c6765c45cd0335549d9dd3fa516ce8fc68a48833.
Revert "CircleBattery fix layout for statusbar font size change"

This reverts commit 79912fa0ee0b5e41de253b7cfe11ccc127cb986c.
Revert "Fix build?"

This reverts commit 589be1171c553265980ce267d33c4016a69cb4e5.
Revert "FW : Allow user selection of Font Size"

This reverts commit 3290c2f31b4caa1ebd090fa68f52e77c4f03c067.

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java