Merge "graphics: allow IAllocator 2.0 and IMapper to 2.1"