With fix for VS2013.

BUG=None

Change-Id: I9f656efa6b540a03ce21f6b65fde0753c0d72538
Reviewed-on: https://chromium-review.googlesource.com/295157Tested-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>