Revert "vendor_htc: Sync with current AICP endeavoru vendor"

Bring it inline with CM (TheMuppets)

This reverts commit 5e528b25b8e1dca11fa03b2ea95c610b191f413e.