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

Change-Id: I48eb3aad095ceed40f787b6f510b78cadc79176a