[FIXED JENKINS-18919] Support named AVDs while 'keep in workspace' is enabled.