Merge "Revert "Make native metrics logger write to statsd socket""