bpf loader improvements for better long term compatibility with mainline am: 9217eee3df

Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/1754794

Change-Id: I8e928d4771f51fb01bdb06f59d093517fbff888a