am 5cb8e796: am f236bdda: (-s ours) am 450ed3e8: am eeab5cd5: Merge "metricsd: Remove unused Chrome OS specific files."

* commit '5cb8e7963bdcb45e63148bf098feb80cb372f20e':