Merge "update dest .vts file paths for nfc host-side tests" am: 2de17375b2
am: d904c19806

Change-Id: I3e0473b07f2ec05beae318f390e07719e2bcc347