Merge "Merge "Bump vdex version to regenerate vdex files" into oc-dev am: cd3d23c17b am: 83359e4387" into oc-dr1-dev-plus-aosp
am: b85694d47e

Change-Id: I2ade12dfc06111281355da820017cb90adbf7114