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

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