Merge "Bump vdex version" am: 59949b79aa
am: 4d0cd8c743

Change-Id: I0e92c86bc338bb43b142e236ae53cb0f74a762e2