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

Change-Id: Id465d49af30d788e49d5c04db18dac78af376aea