am 7fb08a74: am a9f1ed16: Merge "metricsd: Use the metrics directory everywhere."

* commit '7fb08a74fd1f1cc805fcec1eb672e0c1ef714a46':
  metricsd: Use the metrics directory everywhere.