Merge "Use VerifierDeps test file for dex2oat swap tests." am: 7a2a3407a8 am: 808a103d4b
am: 34abf28603

Change-Id: I6389c5e3f7ff92219e817cf7518daa8818596241