Revert "pyramid: Various defconfig changes"

This reverts commit 5e84a9fb80ca6ec1e9e1d1d5475aca1c5e328108.

Change-Id: I800ae231af515d5b1b9e3655cdb9a7b43db38b2a
Revert "pyramid: merge shooter graphics options with pyramid"

This reverts commit cda79e078f48506f84a67f0509176695af366ff0.

Change-Id: Ibfa1eb9f45b0f0e61a5eb951abce1f8c326e768c
Revert "Re-Apply "Update HTC baterry driver""

This reverts commit 0b0ce079e7630d00c41c9143f2ee4bb7e5a0ff99.