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

* commit 'c18624799b0dd832c0dd1f70455dd5912605291b':
  metricsd: Collect generic stats about the system.