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

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