SystemUI: Rework battery status styles, (1/3):

As battery status style "Icon" and "Icon (Mini)" will break theming with Theme Chooser Themes,
this brings back the default CM battery status styles "Icon" and "Icon & text".
(called "Icon (Android)" and "Icon Mini (Android)")

Also remove the battery status style "Circle (AOKP)", it isn`t needed any more,
a "Circle (AOKP)" like style can be "created" by changing the custom dots values.

Change-Id: I443722a1eadf718969dc09900a14f5243c35921b