Merge "Expose libstatssocket as a stable C API" am: 2ff1eac71a am: 1662e44207 am: dada41d2cc

Change-Id: I33cd016ccbe2ce29b775b7a630c46bc00917114f