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

Change-Id: Iba8828dde07888033dfbef9bbb9ad47fd2347fb8