More build fix on Windows.

Change-Id: Icd853b1ce34752c7a063c6306f5a63a0a3ab1657