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

* commit 'f236bdda07f0b1984abc35dc667de77e2a1e9d14':