Merge cherrypicks of ['googleplex-android-review.googlesource.com/39828406'] into 26Q2-release.

Change-Id: I00fb37b3ebebd2f799fff0fb5793b546a0781e2d

build/tools/sdk-preprocess-files.mk

diff --git a/build/tools/sdk-preprocess-files.mk b/build/tools/sdk-preprocess-files.mk
index 66ad90a..b577562 100644
--- a/build/tools/sdk-preprocess-files.mk
+++ b/build/tools/sdk-preprocess-files.mk
@@ -51,6 +51,8 @@
 	-e 's/$${EMULATOR_MINIMAL_VERSION}/$(EMULATOR_MINIMAL_VERSION)/' \
 	-e 's/$${SYSTEM_IMAGE_TAG_ID}/${SYSTEM_IMAGE_TAG_ID}/' \
 	-e 's/$${SYSTEM_IMAGE_TAG_DISPLAY}/${SYSTEM_IMAGE_TAG_DISPLAY}/' \
+	-e 's/$${EXTRA_SYSTEM_IMAGE_TAGS}/${EXTRA_SYSTEM_IMAGE_TAGS}/' \
+	-e 's/$${EXTRA_SYSTEM_IMAGE_TAG_DISPLAY}/${EXTRA_SYSTEM_IMAGE_TAG_DISPLAY}/' \
 	$< > $@ && sed -i -e '/^AndroidVersion.CodeName=\s*$$/d' $@
 endef