android_servers: Fix the duration argument for CPU_BOOST

Clear incompatible pointer conversion errors in 64bit

Change-Id: I4df49249dede5fedc65a4fb1fc06c099a3262065
Revert "Battery icon: enable in-icon percentage indicator"

This reverts commit 4651e532df27c5c92b3433576177aca01f5306d3.
SystemUI : Make battery percentage configurable

Change-Id: Ibfc0cf9c5a4efc13ecd3c3e99723bb2b717c50a7
Fix battery % always showing at < 100%

Change-Id: I9ce697e824e1f85becfd0e53519d3ae36fc65758

Conflicts:
	core/java/android/provider/Settings.java
Battery text mode (1/2)

PS2: Make battery level more fit current solution
PS3: Fix displaing battery level inside the icon
PS6: Show battery level in status bar header when charging and percentage
     mode set to inside icon (it's replaced by charging icon)

Change-Id: I537c99827e78c796b4980ec7751e5f9b58a88251
Signed-off-by: kecinzer <kecinzer@gmail.com>

Conflicts:
	core/java/android/provider/Settings.java
Forward port battery icon options [1/2]

Bring forward the various battery icon options.
Portrait, Landscape, Circle, Text.

Still retains new options for where to display battery percentage text.

Change-Id: Icfc14d989eebde9014538291c24aa76d328df234

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java