Quick: Fix a DCHECK to take type conflicts into account.

Bug: 21865466
Change-Id: I010c7058b5a58bea1ec61af5bd6a12c2eb8de1b4
1 file changed