Merge "more classic bpf macros" into main am: 0d55be75fd am: 147d0d844f

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

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