Adapt to switch to libc++ for Windows am: 29e3dd8548
am: ff229321fd

Change-Id: I629b2b7713aefc67cab2aaa0a6b3453f86f98841