Merge "Add tests for new constructors in java.util.Scanner" am: 9e1e07a5e8 am: f905eb1956
am: 7a41f4dcbc

Change-Id: I7c54d1712a3226dcce34fcbb247e7cf642afd438