Partial Revert of "pyramid: Various defconfig changes"

Change-Id: I8e6d8ab1b0cc09c22d421a7651455620507748bd
Partial Revert of "pyramid: merge shooter graphics options with pyramid"

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

This reverts commit 0b0ce079e7630d00c41c9143f2ee4bb7e5a0ff99.
Re-apply "cpufreq: import updated ondemand from ChronicKernel/Bruce's kernel"

This reverts commit 1685af462a832ae64395dc36e73d64925dbf222f.