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

* commit '630e05b6af5f76bd7f063840e543186bde40ff0a':
  metricsd: move timer.h into include/metrics/