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

Change-Id: I87868a6c2d0c59c47235c2317d1133afbdedba55