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

Change-Id: I3c6210e3f850f5ed5f45bd7433203ea30c50a8ac