Merge "ART: Fixing build breakage (sharpening DCHECK)."
am: 7a687680e2

Change-Id: I8ffbe21a473ea575e27c5f3ec8cb1688d5444426