gr_surface was causing confusion for no good reason. Change-Id: If7120187f9a00dd16297877fc49352185a4d4ea6
Change-Id: I59e08a304ae514a3fdb6fab58721f11670bc1b01