Merge "Get rid of BPF_FD_JUST_USE_INT" into main