[test spec] Update scheme

Per a good suggestion of phosek@'s, there will only be one scope of
`dimensions` and these will match the dimensions we register with
Swarming precisely.

Change-Id: I3b58b3d93b29a2e1493d2ce4148823cc7e131099
4 files changed