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

* commit 'be3f400c8c3e721bc1fe543d7a086ec89fe43453':
  metricsd: Remove unused type declarations