Merge "Revert "Make native metrics logger write to statsd socket"" am: 18a936b3ad am: 61a700f663
am: 72756f3e2c

Change-Id: I592560e7d23ce7d8e7e37728d4d69f188809d1a8