Merge "Tidy OldSocketTest.test_connectLjava_net_SocketAddressI_setSOTimeout."
am: ad55e87fc5

Change-Id: I932657e168a87dcf87a03bea2c935af26871b294