Merge "CFI Versionscript changes in bp2build" am: 197f4306 am: 82674cf6...

Merge "CFI Versionscript changes in bp2build" am: 197f4306 am: 82674cf6 am: c554111b am: edd2ecf8 am: f5975635 am: 26fce09b

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



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