1.Adjusted backlight duration when the screen is turned on.
2.Optimized Waves effect.
3.Improved charging performance.
4.Optimized LCD display effect.

Conflicts:

	arch/arm/mach-msm/include/mach/qdsp6v2/rtac.h
	drivers/power/qpnp-charger.c
	include/sound/q6adm-v2.h
	include/sound/q6asm-v2.h
	include/sound/q6audio-v2.h
	sound/soc/msm/qdsp6v2/msm-pcm-q6-v2.c
	sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c
	sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.h
	sound/soc/msm/qdsp6v2/q6adm.c
	sound/soc/msm/qdsp6v2/q6asm.c
	sound/soc/msm/qdsp6v2/rtac.c