am c3f866f6: Merge "metricsd: Use system properties to store build time metadata."

* commit 'c3f866f60cedc7eade674a7a8eec740dd938264f':
  metricsd: Use system properties to store build time metadata.