Express: Battery update from stock kernel (hopefully fix battery drain)
Another merge

Conflicts:
	drivers/media/video/msm/flash.c
	drivers/media/video/msm/msm.c
	drivers/media/video/msm/sensors/s5k4ecgx.h
	drivers/media/video/msm/sensors/s5k4ecgx_loganre_regs.h
	drivers/media/video/msm/sensors/s5k4ecgx_regs.h
	drivers/media/video/msm/sensors/s5k4ecgx_v4l2.c
	drivers/media/video/msm/sensors/s5k4ecgx_wilcox_regs.h
	drivers/media/video/msm/sensors/s5k5ccgx_v4l2.c
	drivers/media/video/msm/sensors/sr030pc50_regs.h
	drivers/media/video/msm/sensors/sr030pc50_v4l2.c
	drivers/media/video/msm/sensors/sr030pc50_wilcox_regs.h
	drivers/media/video/msm/vfe/msm_vfe32.c