Merge "healthd: move HealthServiceCommon"