Merge "bpf programs: switch from integers to #define'd bpfloader versions" am: fb2dd8d15c

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

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