Merge "healthd: `GRSurface` now is a class."
am: bebeb7e951

Change-Id: Iaa1f6883115704b242adccd5764522bdb3266b2e