Merge remote-tracking branch 'caf/LA.AF.1.1_rb1.7' into cm-12.0

Conflicts:
	drivers/misc/qseecom.c
	fs/proc/task_mmu.c
	include/net/addrconf.h
	include/net/tcp.h
	net/ipv4/syncookies.c
	net/ipv6/addrconf.c
	net/ipv6/ping.c
	net/ipv6/route.c
	net/ipv6/tcp_ipv6.c

Change-Id: Ic999aac4f727612f8c23089042e671f29ab2636b