Merge "switch to classic bpf macros" am: ea07e4dff2 am: ef5a6afcd8

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

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