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

Conflicts:
	fs/proc/task_mmu.c

Change-Id: I256fd02f3c5b40359add41ecf315c7338098f0a6