Merge "Fix broken libbpf_test"