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

Change-Id: Id655ed032a7b4c12dbdce8d9c424fbbc4ebd0829