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

Change-Id: I828d41c0a74e2926a1ed42ce45a774c2cacd9bfd