Merge "Make native metrics logger write to statsd socket" am: d301f1bce4
am: b6f5ec7c29

Change-Id: I8dd3fe59adbb917543a065ab41c162c98b3d7f99