Merge "metricsd: Remove unused type declarations"
am: 9729392ffa

* commit '9729392ffa40ed37aab7fd535c6644d20279bbf0':
  metricsd: Remove unused type declarations