Merge "clatd: embed struct tun_pi directly in buf"