Squash Commits from RazrQcomDevTeam

Conflicts:
	include/sound/q6asm.h
	sound/soc/msm/msm-compr-q6.c
	sound/soc/msm/msm-pcm-routing.c
	sound/soc/msm/qdsp6/q6asm.c