Merge "FileInputStreamTest : Add test for skips of files larger than 2G."