The first hunk of the patch was merged in apparmor-profiles-extra
version 21 (line deleted instead of being commented out, so that
generates an FTBFS), and the second hunk needs unfuzzying.