Adapt to switch to Clang for Windows host builds
am: 8e52362e45

Change-Id: Ie06c3b6959a1a7f3729eb1f55e059942012c1cff