Merge "Fix java.util.Scanner bugs."