Merge "leak_test: use tgkill to check if threads are alive." am: 80d85f72dd
am: 6f844f936f

Change-Id: I2bad3d4a8fb251da87ee1d7a54c914244369dded