Re-Apply "Update HTC baterry driver"

Battery drain reports were a little pre-mature

This reverts commit 866c0153335b4eb043aee094d8d25d94b41d6328.