Merge changes from topic "windows-libcxx"
am: a2ccce870c

Change-Id: I7c0082c9e7e7d9ffa2fa990d029217c261512d93