Merge "Fix class unloading with the CC collector." am: dd4cbcc924 am: d0282856d1
am: da0be299ff

* commit 'da0be299ff55d077275223a67b713f11e3557b16':
  Fix class unloading with the CC collector.