am 3a17b98a: Merge "Fix libcore.java.util.OldScannerTest#testPerformance."

* commit '3a17b98aa09bb4105663a56ddcb19abeea69ae92':
  Fix libcore.java.util.OldScannerTest#testPerformance.