Merge "Make 141-class-unload more robust under JIT."