Fix linux and windows builds. Ooops.

Change-Id: Iae458b718e60c8eafa3e732870e6818eb42e68be
Merge "Fix linux and windows builds. Ooops."
Fix Windows builds. Oops #2

Change-Id: I707bd8e6204c6fa209243a5fb3736e42f03001e5
Merge "Fix Windows builds. Oops #2"