Merge "Update vts files on aosp."
am: 248e3932fe

Change-Id: I147799a7b93d100a5340aa0150540f6b6142e72e