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

Change-Id: I32dcca621065cbc8467768bfb5bf312971179ff6