Merge "Fix TreeMapTest#test_spliterator_valueSet."