Merge remote-tracking branch 'common/android-3.4' into khaon-new

Conflicts:
	arch/Kconfig
	arch/arm/kernel/ptrace.c
	fs/exec.c
	include/linux/sched.h
	include/linux/seccomp.h
	kernel/seccomp.c
	kernel/sys.c
	security/apparmor/domain.c
Merge remote-tracking branch 'common/bcmdhd-3.10' into test-new