backport and enable apparmor

Conflicts:
	security/apparmor/domain.c