am ed31badc: Merge "Fix bug in CardTable::ModifyCardsAtomic."

* commit 'ed31badc6de501320f49bec679dcdf9214ac07cc':
  Fix bug in CardTable::ModifyCardsAtomic.