mach-msm: rpc: don't use hctosys
mach-msm: htc_battery: ifdef properly!