Merge "Update NFC VTS configs to reflect new source paths"