am a387c9c9: am defbd39c: Merge "metricsd: Read build time values from etc/os-release.d."

* commit 'a387c9c9cd7cca4aefeae2f4ece313f12a683a94':
  metricsd: Read build time values from etc/os-release.d.