Merge "Update vts files on aosp." am: 248e3932fe am: 848e5db57f am: 832e7bd89a
am: 47497a0536

Change-Id: I2a66a8ef82ce6d93ad8ab274832dd3fdb15a0f95