Merge "Merge "Bump vdex version to regenerate vdex files" into oc-dev am: cd3d23c1 am: 83359e43" into oc-dr1-dev-plus-aosp