Merge "bpf: rename BPFLOADER_MAINLINE_VERSION to BPFLOADER_MAINLINE_S_VERSION" into main am: 9c493b5fd7

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

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