Merge "remove SKIP_IF_BPF_NOT_SUPPORTED"