am 795ad6c7: am f06041d7: Merge "metricsd: Rename metrics to metricsd."

* commit '795ad6c74488f8f9f202010be4a0b3df30d2d0de':
  metricsd: Rename metrics to metricsd.