Merge "graphics: add createDescriptor_2_1 to mapper"