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

Change-Id: Ia0c5cb6b90d0f61c8d1099c0bec8a28efed5bd00