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

Change-Id: Id988b6e21dcb4a9ff96b4c92231b5ae3515bfb02