Merge "Separate vdex versioning into two sections: verifier deps and dex code." am: 640df849 am: 9bc3e284 am: d08fe801 Change-Id: I2aed29f555c4ea78c8aa1e52ec0a08e3f1e90a15