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

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

Change-Id: I0a333e10899cfc47e7a4da5b44d8d23839655d51