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

Change-Id: I745019f74d49a7bd91bda28e763315ab42c442d8