Power ON while in charge fix and some other kernel changes

Conflicts:
	arch/arm/configs/jf_defconfig
	arch/arm/mach-msm/msm_rq_stats.c