[automerger skipped] Merge "Add support for extension version in variables"...

[automerger skipped] Merge "Add support for extension version in variables" am: d841c353 -s ours am: 7ff2b2c7 -s ours am: a6c59a08 -s ours am: 9b428773 -s ours

am skip reason: Merged-In I82a90b83d23b0ba3779a943c2ad444bf5cf937da with SHA-1 b021bf8c is already in history

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

Change-Id: Ibc452521f8b8ebce3f286d123ae8a2c722d0738c