Merge "Move ThreadDeath event before clearing Thread.nativePeer" am: 2ea15e1f am: 76d049ca am: a6de6b93 am: aa9144a0 Change-Id: Id0145b96e35654077f680148cebee5db19a19289