Merge "Revert "Include libstatssocket to art build""