Update job names

Job names are about to change in infra/config.  Be a little more
robust (but still, this is fragile).

Change-Id: I882de80dbb02aad68ef7b41095f36db2c7ebec49
Merge "Update job names"