Add missing <algorithm> include. Needed for std::max/min.

Change-Id: I6f016c2bca7c51f275c3b5abb78eb3641e5445dd
Merge topic 'vs2013_fixes' into master

4228c2d8 Add missing <algorithm> include. Needed for std::max/min.