More battery styles (1/2)
Merge branch 'cm-10.1' of github.com:PAC-man/android_frameworks_base into cm-10.1

Conflicts:
	core/java/com/android/internal/util/aokp/BackgroundAlphaColorDrawable.java