Merge "Bump vdex version to regenerate vdex files"
am: 8979f71079

Change-Id: Iad7222712e6c2670cdcdf3c007251b6c45a2b83b