Merge "Revert "Make native metrics logger write to statsd socket""
am: 18a936b3ad

Change-Id: I046ca998a78397028e6705061bb58f33248742c0