Merge "adjust BpfCompatTest now that clatd & netd bpf program have been mainlined"