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

* commit '14e61ffeb820e436f73c6f6e1c4269094eaf3b47':
  metricsd: build on non-Linux hosts