Reapply "Update HTC baterry driver" - Battery drain reports premature.
This reverts commit a75c5c232136ee5d41c68b19b545aeb58c5bb411.