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

Change-Id: I52bb55409ff721c367419b9778ee7e8da263e85c