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

* commit '0f10e791eb977b0578c86d84e35787f439457bb1':
  Fix DCHECK failures from Class::VisitFieldRoots