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