Merge "Re-enable harmony ServerSocketTest"