Misc fixes for 64-bit Windows toolchain

Change-Id: Idaf7d93dfd031e40b7b005805e71688f079e94ac
19 files changed