Merge "switch to classic bpf macros" am: ea07e4dff2

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

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