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

Change-Id: Ife454ed4115b86132fd26e4f2a56e65fa9cf1fe3