Merge "Bump vdex version"
am: 59949b79aa

Change-Id: I6b72a7907de567b1cce49cae8be15c9dc0c4ec03