Merge "Move ThreadDeath event before clearing Thread.nativePeer" am: 2ea15e1f2f am: 76d049ca3d
am: a6de6b9351

Change-Id: If0681355b8a20562c75a25fcd551f904d58d1eec