Merge "metricsd: Remove unused type declarations"