Merge "Change thread.h to thread-inl.h to pick up missing Thread::Currnet for debug build in master"