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

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

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