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