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

Change-Id: I2da080b2fb4dbd7fba37bad9ac53d9d99d9c0612