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

Change-Id: Id073592f2fed177b82eb4ca0e71a23a1c74f59d9