Merge "Fix a DCHECK failure due to unmatching numbers of cards scanned." into dalvik-dev