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

Change-Id: Ia4f13c6542334601273dea5a35b47a2df17b3ba0