release/21.x: [BPF] Backport backend fixes related to BTF#165154

c-rhodes merged 2 commits intollvm:release/21.xllvm/llvm-project:release/21.xfrom

vadorovsky:bpf-backports-21.xvadorovsky/llvm-project:bpf-backports-21.xCopy head branch name to clipboard