mach-msm: bravo: include htc_battery, fix pm2
Merge branch '3.0-wip' of github.com:nikez/android_kernel_htc_qsd8k into 3.0-wip