Merge "Separate vdex versioning into two sections: verifier deps and dex code." into pi-dev am: babfd0d4 -s ours am: f65671bf Change-Id: I35c9fb78cd14d642a60190bf2c286c96e844c334