am 20bcec87: Merge "Fix java.util.Scanner bugs." into klp-dev

* commit '20bcec87d24710e0d0469020f8738583218ab5bb':
  Fix java.util.Scanner bugs.