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

Change-Id: I88db87d048f332fec073aecdc583d685ee95350e