Revert "Revert "native: Add dock battery support""

This reverts commit 1aa2df93215943c22f7f10e7954cac3110c9976b.
Merge branch 'cm-11.0' of git://github.com/CyanogenMod/android_frameworks_native into kk44
Revert "BatteryService: Restore the original parcel order"

This reverts commit d7065ba1fe4e6b76ab1b4f47e9e881ae78cdaa06.
Revert "Revert "Revert "native: Add dock battery support"""

This reverts commit 48ba806d5c43fbe63846dd8e5db2094cb669494c.