Merge "Revert "Revert "Include libstatssocket to art build"""