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

Change-Id: I5627275e9c0cf5dc1415dc927cb871fb5d8207df