Merge "metricsd: Add tests to the default debug build." am: 7fbe8b9285
am: 3a6ccb35dc

* commit '3a6ccb35dc7d2bcadd9c5f7ed88c4e07e6a42242':
  metricsd: Add tests to the default debug build.