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

Change-Id: If7464673e719728b98128fb7c2e4bfe3e6cb80e2