Merge "Fix class unloading with the CC collector."