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

Change-Id: Ie29071455c9ca3cf1a7293972347cbc6c9a9f9f1