Merge "Package libwinpthread-1.dll in platform-tools."
am: 52c291d53c

Change-Id: I3b219b20f203ee4deb837f05a2df74720c6ad2bf