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

Change-Id: I20243826ce61537cc7420b78ef189b686c92fafd