Merge "Fix two tests after vdex change."