Merge "Relocate usleep for Thread::Unregister"
am: edad2aaa63

Change-Id: I71a64a5f0f2fd4b1141e34f8d49e56be630f5e9a