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

Change-Id: Idcfe9106ca48ed40747273a897247e70e95c08e9