Merge "fallback to v2 on s build" into main am: 3903154c

Original change: https://android-review.googlesource.com/c/platform/build/+/3001434



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