Merge remote-tracking branch 'codeaurora/caf/kk_2.7_rb1.42' into cm-11.0

Conflicts:
	drivers/media/video/msm/msm_vpe.c

Change-Id: I68cc48a1dc3d2ed71c7b013aeb10be7748812769