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

Change-Id: Icbf9b17fdf5360bcb552c6b60002a71feb782a1b