Merge "Statically link libwinpthread into windows binaries." am: 61d68b6152
am: aa19e7a2bb

Change-Id: I1f6ae14785d66e621ec8c07cc312655713e58436