Merge "minui: Move GRSurface into a class."
am: 66a576b79c

Change-Id: I8b9a75bc1316fcce85ee4aaac9f294c026521b5c