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

Change-Id: I4a626813cceb1f7857acfb028daf63e99b869247