Remove an unused variable

This fixes a warning in MSVC.
Include time.h in DataGenerator.cpp

This fixes building on MSVC.
Merge pull request #497 from mstorsjo/remove-unused-variable

Remove an unused variable
Merge pull request #498 from mstorsjo/add-missing-include

Include time.h in DataGenerator.cpp
Merge remote-tracking branch 'upstream/master' into travis.android