Merge "Don't include stdlibc++.so in win platform-tools"