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

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