Merge "Update vts files for nfc hidl file style change."