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

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

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