Fixed more Windows build errors.

Change-Id: I556e1c103e8501dc144b16c8698463253de6f4fb
9 files changed