Fixes defect with test_links

* Removes check for swap field, which is optional for flavors.
  Will re-add as an optional check.

Change-Id: I515761f46bb7969a949bb42c2eb9f3fde4149e97
Merge "Fixes defect with test_links"