fixup! JENKINS-11083: Support for custom suffix in generated AVDs.