Merge "Use VerifierDeps test file for dex2oat swap tests."
am: 7a2a3407a8

Change-Id: I4f0fefa72714f79a30caac52805d97e2cce4e8d6