Merge "metricsd: Use the metrics directory everywhere."