Merge "Don't include stdlibc++.so in win platform-tools" am: 75db0e8a16 am: b9cc94cdbd am: aa9b75e636 am: 649ee4b948

Original change: https://android-review.googlesource.com/c/platform/development/+/1466461

Change-Id: I92c0c3b025cbdabe19989d3d5e335ea39fff9f3b