Merge "Get rid of BPF_FD_JUST_USE_INT" into main am: cc7a5a3674 am: 639c27e223

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3371422

Change-Id: Ie69b15878a6a48b266ee68808114160839e2351f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>