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

Change-Id: Iad9f3317f453b78c4dbbf30f53739f820576a572