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

* commit 'f06041d7f4c6fcfa91fcffde77d40f0a68760267':
  metricsd: Rename metrics to metricsd.