am 07ee1fa6: am c3a64d38: am cb6cd44d: Merge "Revert "metricsd: Collect generic stats about the system.""

* commit '07ee1fa69a66000fbbb6817663c7ee1d9bc440c5':
  Revert "metricsd: Collect generic stats about the system."