Merge "metricsd: Split into two daemons." am: f3f2c63adb am: b84b7c79a0
am: aebad83121

* commit 'aebad83121fb60125d8332cfaae972de1bcdae6b':