Merge "add test for /system/etc/bpf/{netd,clatd}.o using correct struct sizes" am: 464d0b2bdd am: b2817e8e31 am: 58a4324397 am: 4c23e0ed6a

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1756440

Change-Id: Icda733941ea8465e8df190a3e3ce5021f1f2402c