am 3a8a8bce: Merge "metricsd: Use product id instead of build target id."

* commit '3a8a8bce3fa0bad4324f87777328d09ca6d4f426':
  metricsd: Use product id instead of build target id.