Merge "Fix two tests after vdex change."
am: 02d45c6afc

Change-Id: I3d6e05b4d1a033a7ba4ffe4f868186a51e469795