Merge "switch to classic bpf macros"