Revert "Build fix from Merge"

This reverts commit 7c961b8d4ec534145fda22fcb3254c933e341f21.
Revert "settings: Add text plain battery style"

This reverts commit 20deb49bd4cd805e5901a42368cb9a7b3c28fdeb.

Conflicts:
	src/com/android/settings/cyanogenmod/StatusBar.java

Change-Id: Ibee715e1e8880a9e9e42de249f3ce976bc7f18ff