am a4d9a59a: am 9e45f201: Merge "metricsd: Rename build_target_id to product_id."

* commit 'a4d9a59a0782b666f58063820f643250347c7d0b':
  metricsd: Rename build_target_id to product_id.