[automerger skipped] Merge "Add new make variables for extension SDK version"...

[automerger skipped] Merge "Add new make variables for extension SDK version" am: 0d201ba4 -s ours am: bd2e36f2 -s ours

am skip reason: Merged-In Ib078a922e9bd9bc6ae82ab74feaeb743703a64b8 with SHA-1 9b8082c2 is already in history

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

Change-Id: I969f3dd05b9fb7613f7099546a1d9a5e266b0101