Merge "add test for /system/etc/bpf/{netd,clatd}.o using correct struct sizes"