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

Change-Id: Id0145b96e35654077f680148cebee5db19a19289