Merge "Bump vdex version to regenerate vdex files" into oc-dev