Merge "sigchain: switch from __thread to pthread_setspecific." am: 36831abc29
am: ef349c728d

Change-Id: Ic603db8698b0e8d162f3dc2133a19481d48bb080