Merge "clatd: use offsetof"