Merge "Bump vdex version to regenerate vdex files" into oc-dev am: cd3d23c17b am: 1d3488bfc3
am: 2bc97306bd

Change-Id: I85697907efdf13af2df3ad1a60cc08dcf835ec94