circlebattery bugfixes

Change-Id: I97bb4f28523d26e4c3e549c04e82400a21d70a61
Merge branch 'jellybean' of https://github.com/ParanoidAndroid/android_frameworks_base into jellybean