Merge "Fix a brain dead mistake in DeflaterInputStreamTest."