Merge "switch to classic bpf macros" am: ea07e4dff2 am: f522c99283 am: 129370789a

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

Change-Id: Ia80e1474beba6e5ca2d9d02c1dd9881a5d7dafb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>