Merge "Revert "Make libstatssocket a shared_lib""