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

* commit '4369c1e788ba1728239ddf2663b3805edf22c0cd':
  metricsd: Use the metrics directory everywhere.