Merge "Revert "metricsd: Collect generic stats about the system.""