Merge "Bump vdex version"
am: 117781a424

Change-Id: I999322196b616d26e57ab6c6c0acb385aa15bd24