Merge "Fix use-after-pthread_exit in a test." am: 3f8bdb216c
am: 7bf8ee1d51

Change-Id: I8513d3860360d12308f00e78151431bb72f780f1