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

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

Change-Id: I112aa17e4c04cea4baf9fedf8db5e89a3922e537