am 3d80ee72: am 14e61ffe: am b4f47a30: Merge "metricsd: build on non-Linux hosts"

* commit '3d80ee721ed85cfdd279037923d78bb2e2d95946':
  metricsd: build on non-Linux hosts