Fixed Windows build errors.

Change-Id: I11548bfa3cfe307598eb59c56412974c349d614d
4 files changed