am a42ce207: am 0f10e791: am 5b310c4b: Merge "Fix DCHECK failures from Class::VisitFieldRoots"

* commit 'a42ce207656e616912b395785fbb66b8b7091d5f':
  Fix DCHECK failures from Class::VisitFieldRoots