Merge "graphics: rev IAllocator/IMapper to 4.0"