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

* commit '5b310c4bc77609d8247356005430ae05714e9585':
  Fix DCHECK failures from Class::VisitFieldRoots