Labs: Make swap a primary partition in images

Vmbuilder seems to special-case the "just one partition" case
and assign the whole disk.

Change-Id: Ibc151f47824c41ad1332337f6667d1e6741a1744