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

Change-Id: I8e52d23c55d98c537b4cb5c8d2b1c88a0200caf1