Changes to support Windows.

Change-Id: Ic7f6597700b13d1800d2d1faaaffd2e6fc159709