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

Conflicts:
	fs/proc/task_mmu.c

Change-Id: I08fa2e747789d3ed24bb22c42c399f0b1bbe90f2