Merge "Bump vdex version"