Merge "graphics: remove duplicated types"