Merge "Bump vdex version" am: 117781a424 am: 7f4a95bc8e
am: d446c9741a

Change-Id: I0f9c6937f4c56ddf343b3e5ad040f92ce6e7399d