Merge "switch to classic bpf macros" am: ea07e4dff2

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

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