Merge "Separate vdex versioning into two sections: verifier deps and dex code."