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

* commit 'a9f1ed16a839ec4cc974e66734c11a01e8d71820':
  metricsd: Use the metrics directory everywhere.