Merge "Update OsTest#test_socket_setSockoptTimeval_effective"