BatteryService: Restore the original parcel order

Append the dock extensions to the end of the parcel to preserve
compatibility with the original parcel format.

Change-Id: Ib4fa8473fcab9882d41bd9f9617af163154290ab
Merge remote-tracking branch 'github/cm-11.0' into cm11
Revert "BatteryService: Restore the original parcel order"

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

This reverts commit b245ffb9bff2340df26c86f8a4faba69b61d7acd.