[automerger skipped] Merge "Add new make variables for extension SDK version" am: 0d201ba426 -s ours am: bd2e36f29e -s ours am: 4f83c216fd -s ours

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

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

Change-Id: Ibfd7a6ee1404457fe187d8b5112c31f5a5f619ef