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

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