Settings: Forward Port Circle Battery and Landscape Battery (2/2)

removed Slims battery options

Thanks to @Sven-Dawitz & @jruesga from CM and @Mahdi-Rom for porting it.

Conflicts:
	src/com/android/settings/crom/BatteryIconStyle.java