The logic dealing with in vs out-of-process tethering flags was added in aosp/master once it was already not merging to tm-dev, thus ending up only in udc-dev, it was later removed in aosp/master, and then cherrypicked to udc-dev. As such there is no shipping version of the bpfloader (besides early U developer previews and betas) with this requirement. This will make September+ releases of the tethering apex incompatible with U developer previews and betas 1 and 2. (ie. any U build not including https://googleplex-android-review.git.corp.google.com/c/platform/system/bpf/+/23214402 which was merged into udc-dev on May 14th @ 18:00) This change has a dependency on https://googleplex-android-review.git.corp.google.com/c/platform/vendor/google/modules/TetheringGoogle/+/23243439 Test: TreeHugger Bug: 279942846 Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I52d0ea706a8e2cb5c37874ed54f199035c14966c