Merge "Add libstatspull and libstatssocket to the apex"