Merge "Use a per-thread VerifierDeps."
am: b46782abf6

Change-Id: I900234e05e0ec4bd9daaf2cbff4342bbc8cdc969