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

Change-Id: I7c4f5e81168cdd12ea7cfe02ccf21742df19f3c0