Merge "Fix libcore.java.util.OldScannerTest#testPerformance."