Merge "SKIP_IF_BPF_NOT_SUPPORTED is a no-op"