Merge "Use VerifierDeps test file for dex2oat swap tests."