Merge "Make native metrics logger write to statsd socket"
am: 91061cc823

Change-Id: I288dbb50e43d50beedfcbc9018785b0f508bb418