Fix the problem of the charger being switched off by the USB subsystem
when charging by AC.

Change-Id: Ib2dedf312a87ff84b2a6fd3b6d1b4443dd86f335

Conflicts:
	arch/arm/mach-msm/htc/htc_battery_8x60.c