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

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