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

Change-Id: If86e71c6f1d99c3a4cd37adf320c2598621c30e9