Merge "Revert "Add allocator field to ClassLoader.""