Merge branch 'xen-harden-netfront'