am 98a69a06: am 630e05b6: Merge "metricsd: move timer.h into include/metrics/"

* commit '98a69a0678769116e9345dd3081252e440ba89de':
  metricsd: move timer.h into include/metrics/