Merge "Update vts files on aosp."